From 71307552a128f65e74bda0563e08ae605ebcd112 Mon Sep 17 00:00:00 2001
From: Christopher Monsanto <chris@monsan.to>
Date: Fri, 8 May 2020 16:58:22 -0400
Subject: [PATCH] Move canonical/custom -> noncanonical

---
 Tupfile.lua                                         |   8 +++++---
 smogon.deploy.js                                    |   1 +
 .../gen5/pokemon}/0003-420-Venusaur-Mega.png        | Bin
 .../gen5/pokemon}/0006-420-Charizard-Mega~X.png     | Bin
 .../gen5/pokemon}/0006-420-Charizard-Mega~Y.png     | Bin
 .../gen5/pokemon}/0009-420-Blastoise-Mega.png       | Bin
 .../gen5/pokemon}/0015-420-Beedrill-Mega.png        | Bin
 .../gen5/pokemon}/0018-420-Pidgeot-Mega.png         | Bin
 .../gen5/pokemon}/0065-420-Alakazam-Mega.png        | Bin
 .../gen5/pokemon}/0080-420-Slowbro-Mega.png         | Bin
 .../gen5/pokemon}/0094-420-Gengar-Mega.png          | Bin
 .../gen5/pokemon}/0115-420-Kangaskhan-Mega.png      | Bin
 .../gen5/pokemon}/0127-420-Pinsir-Mega.png          | Bin
 .../gen5/pokemon}/0130-420-Gyarados-Mega.png        | Bin
 .../gen5/pokemon}/0142-420-Aerodactyl-Mega.png      | Bin
 .../gen5/pokemon}/0150-420-Mewtwo-Mega~X.png        | Bin
 .../gen5/pokemon}/0150-420-Mewtwo-Mega~Y.png        | Bin
 .../gen5/pokemon}/0181-420-Ampharos-Mega.png        | Bin
 .../gen5/pokemon}/0208-420-Steelix-Mega.png         | Bin
 .../gen5/pokemon}/0212-420-Scizor-Mega.png          | Bin
 .../gen5/pokemon}/0214-420-Heracross-Mega.png       | Bin
 .../gen5/pokemon}/0229-420-Houndoom-Mega.png        | Bin
 .../gen5/pokemon}/0248-420-Tyranitar-Mega.png       | Bin
 .../gen5/pokemon}/0254-420-Sceptile-Mega.png        | Bin
 .../gen5/pokemon}/0257-420-Blaziken-Mega.png        | Bin
 .../gen5/pokemon}/0260-420-Swampert-Mega.png        | Bin
 .../gen5/pokemon}/0282-420-Gardevoir-Mega.png       | Bin
 .../gen5/pokemon}/0302-420-Sableye-Mega.png         | Bin
 .../gen5/pokemon}/0303-420-Mawile-Mega.png          | Bin
 .../gen5/pokemon}/0306-420-Aggron-Mega.png          | Bin
 .../gen5/pokemon}/0308-420-Medicham-Mega.png        | Bin
 .../gen5/pokemon}/0310-420-Manectric-Mega.png       | Bin
 .../gen5/pokemon}/0319-420-Sharpedo-Mega.png        | Bin
 .../gen5/pokemon}/0323-420-Camerupt-Mega.png        | Bin
 .../gen5/pokemon}/0334-420-Altaria-Mega.png         | Bin
 .../gen5/pokemon}/0354-420-Banette-Mega.png         | Bin
 .../gen5/pokemon}/0359-420-Absol-Mega.png           | Bin
 .../gen5/pokemon}/0362-420-Glalie-Mega.png          | Bin
 .../gen5/pokemon}/0373-420-Salamence-Mega.png       | Bin
 .../gen5/pokemon}/0376-420-Metagross-Mega.png       | Bin
 .../gen5/pokemon}/0380-420-Latias-Mega.png          | Bin
 .../gen5/pokemon}/0381-420-Latios-Mega.png          | Bin
 .../gen5/pokemon}/0382-420-Kyogre-Primal.png        | Bin
 .../gen5/pokemon}/0383-420-Groudon-Primal.png       | Bin
 .../gen5/pokemon}/0384-420-Rayquaza-Mega.png        | Bin
 .../gen5/pokemon}/0428-420-Lopunny-Mega.png         | Bin
 .../gen5/pokemon}/0445-420-Garchomp-Mega.png        | Bin
 .../gen5/pokemon}/0448-420-Lucario-Mega.png         | Bin
 .../gen5/pokemon}/0460-420-Abomasnow-Mega.png       | Bin
 .../gen5/pokemon}/0475-420-Gallade-Mega.png         | Bin
 .../gen5/pokemon}/0531-420-Audino-Mega.png          | Bin
 .../minisprites/gen5/pokemon}/0650-000-Chespin.png  | Bin
 .../gen5/pokemon}/0651-000-Quilladin.png            | Bin
 .../gen5/pokemon}/0652-000-Chesnaught.png           | Bin
 .../minisprites/gen5/pokemon}/0653-000-Fennekin.png | Bin
 .../minisprites/gen5/pokemon}/0654-000-Braixen.png  | Bin
 .../minisprites/gen5/pokemon}/0655-000-Delphox.png  | Bin
 .../minisprites/gen5/pokemon}/0656-000-Froakie.png  | Bin
 .../gen5/pokemon}/0657-000-Frogadier.png            | Bin
 .../minisprites/gen5/pokemon}/0658-000-Greninja.png | Bin
 .../minisprites/gen5/pokemon}/0659-000-Bunnelby.png | Bin
 .../gen5/pokemon}/0660-000-Diggersby.png            | Bin
 .../gen5/pokemon}/0661-000-Fletchling.png           | Bin
 .../gen5/pokemon}/0662-000-Fletchinder.png          | Bin
 .../gen5/pokemon}/0663-000-Talonflame.png           | Bin
 .../gen5/pokemon}/0664-000-Scatterbug.png           | Bin
 .../minisprites/gen5/pokemon}/0665-000-Spewpa.png   | Bin
 .../minisprites/gen5/pokemon}/0666-000-Vivillon.png | Bin
 .../minisprites/gen5/pokemon}/0667-000-Litleo.png   | Bin
 .../minisprites/gen5/pokemon}/0668-000-Pyroar.png   | Bin
 .../gen5/pokemon}/0669-000-Flabe__0301be__0301.png  | Bin
 .../minisprites/gen5/pokemon}/0670-000-Floette.png  | Bin
 .../gen5/pokemon}/0670-420-Floette-Eternal.png      | Bin
 .../minisprites/gen5/pokemon}/0671-000-Florges.png  | Bin
 .../minisprites/gen5/pokemon}/0672-000-Skiddo.png   | Bin
 .../minisprites/gen5/pokemon}/0673-000-Gogoat.png   | Bin
 .../minisprites/gen5/pokemon}/0674-000-Pancham.png  | Bin
 .../minisprites/gen5/pokemon}/0675-000-Pangoro.png  | Bin
 .../minisprites/gen5/pokemon}/0676-000-Furfrou.png  | Bin
 .../minisprites/gen5/pokemon}/0677-000-Espurr.png   | Bin
 .../minisprites/gen5/pokemon}/0678-000-Meowstic.png | Bin
 .../gen5/pokemon}/0678-420-Meowstic-F.png           | Bin
 .../minisprites/gen5/pokemon}/0679-000-Honedge.png  | Bin
 .../minisprites/gen5/pokemon}/0680-000-Doublade.png | Bin
 .../gen5/pokemon}/0681-000-Aegislash.png            | Bin
 .../minisprites/gen5/pokemon}/0682-000-Spritzee.png | Bin
 .../gen5/pokemon}/0683-000-Aromatisse.png           | Bin
 .../minisprites/gen5/pokemon}/0684-000-Swirlix.png  | Bin
 .../minisprites/gen5/pokemon}/0685-000-Slurpuff.png | Bin
 .../minisprites/gen5/pokemon}/0686-000-Inkay.png    | Bin
 .../minisprites/gen5/pokemon}/0687-000-Malamar.png  | Bin
 .../minisprites/gen5/pokemon}/0688-000-Binacle.png  | Bin
 .../gen5/pokemon}/0689-000-Barbaracle.png           | Bin
 .../minisprites/gen5/pokemon}/0690-000-Skrelp.png   | Bin
 .../minisprites/gen5/pokemon}/0691-000-Dragalge.png | Bin
 .../gen5/pokemon}/0692-000-Clauncher.png            | Bin
 .../gen5/pokemon}/0693-000-Clawitzer.png            | Bin
 .../gen5/pokemon}/0694-000-Helioptile.png           | Bin
 .../gen5/pokemon}/0695-000-Heliolisk.png            | Bin
 .../minisprites/gen5/pokemon}/0696-000-Tyrunt.png   | Bin
 .../gen5/pokemon}/0697-000-Tyrantrum.png            | Bin
 .../minisprites/gen5/pokemon}/0698-000-Amaura.png   | Bin
 .../minisprites/gen5/pokemon}/0699-000-Aurorus.png  | Bin
 .../minisprites/gen5/pokemon}/0700-000-Sylveon.png  | Bin
 .../minisprites/gen5/pokemon}/0701-000-Hawlucha.png | Bin
 .../minisprites/gen5/pokemon}/0702-000-Dedenne.png  | Bin
 .../minisprites/gen5/pokemon}/0703-000-Carbink.png  | Bin
 .../minisprites/gen5/pokemon}/0704-000-Goomy.png    | Bin
 .../minisprites/gen5/pokemon}/0705-000-Sliggoo.png  | Bin
 .../minisprites/gen5/pokemon}/0706-000-Goodra.png   | Bin
 .../minisprites/gen5/pokemon}/0707-000-Klefki.png   | Bin
 .../minisprites/gen5/pokemon}/0708-000-Phantump.png | Bin
 .../gen5/pokemon}/0709-000-Trevenant.png            | Bin
 .../gen5/pokemon}/0710-000-Pumpkaboo.png            | Bin
 .../gen5/pokemon}/0711-000-Gourgeist.png            | Bin
 .../minisprites/gen5/pokemon}/0712-000-Bergmite.png | Bin
 .../minisprites/gen5/pokemon}/0713-000-Avalugg.png  | Bin
 .../minisprites/gen5/pokemon}/0714-000-Noibat.png   | Bin
 .../minisprites/gen5/pokemon}/0715-000-Noivern.png  | Bin
 .../minisprites/gen5/pokemon}/0716-000-Xerneas.png  | Bin
 .../minisprites/gen5/pokemon}/0717-000-Yveltal.png  | Bin
 .../minisprites/gen5/pokemon}/0718-000-Zygarde.png  | Bin
 .../minisprites/gen5/pokemon}/0719-000-Diancie.png  | Bin
 .../gen5/pokemon}/0719-420-Diancie-Mega.png         | Bin
 .../minisprites/gen5/pokemon}/0720-000-Hoopa.png    | Bin
 .../gen5/pokemon}/0720-420-Hoopa-Unbound.png        | Bin
 .../gen5/pokemon}/0721-000-Volcanion.png            | Bin
 .../minisprites/gen6/asymmetrical}/README.md        |   0
 src/noncanonical/minisprites/gen6/misc/README.md    |   1 +
 .../gen6/pokemon}/0006-420-Charizard-Gmax.png       | Bin
 .../gen6/pokemon}/0012-420-Butterfree-Gmax.png      | Bin
 .../gen6/pokemon}/0025-420-Pikachu-Gmax.png         | Bin
 .../gen6/pokemon}/0052-420-Meowth-Galar.png         | Bin
 .../gen6/pokemon}/0052-420-Meowth-Gmax.png          | Bin
 .../gen6/pokemon}/0068-420-Machamp-Gmax.png         | Bin
 .../gen6/pokemon}/0077-420-Ponyta-Galar.png         | Bin
 .../gen6/pokemon}/0078-420-Rapidash-Galar.png       | Bin
 .../gen6/pokemon}/0079-420-Slowpoke-Galar.png       | Bin
 .../pokemon}/0083-420-Farfetch__0027d-Galar.png     | Bin
 .../gen6/pokemon}/0094-420-Gengar-Gmax.png          | Bin
 .../gen6/pokemon}/0099-420-Kingler-Gmax.png         | Bin
 .../gen6/pokemon}/0110-420-Weezing-Galar.png        | Bin
 .../gen6/pokemon}/0122-420-Mr._Mime-Galar.png       | Bin
 .../gen6/pokemon}/0131-420-Lapras-Gmax.png          | Bin
 .../gen6/pokemon}/0133-420-Eevee-Gmax.png           | Bin
 .../gen6/pokemon}/0143-420-Snorlax-Gmax.png         | Bin
 .../gen6/pokemon}/0222-420-Corsola-Galar.png        | Bin
 .../gen6/pokemon}/0263-420-Zigzagoon-Galar.png      | Bin
 .../gen6/pokemon}/0264-420-Linoone-Galar.png        | Bin
 .../gen6/pokemon}/0554-420-Darumaka-Galar.png       | Bin
 .../gen6/pokemon}/0555-420-Darmanitan-Galar.png     | Bin
 .../gen6/pokemon}/0555-420-Darmanitan-Galar~Zen.png | Bin
 .../gen6/pokemon}/0562-420-Yamask-Galar.png         | Bin
 .../gen6/pokemon}/0569-420-Garbodor-Gmax.png        | Bin
 .../gen6/pokemon}/0618-420-Stunfisk-Galar.png       | Bin
 .../minisprites/gen6/pokemon}/0809-000-Melmetal.png | Bin
 .../gen6/pokemon}/0809-420-Melmetal-Gmax.png        | Bin
 .../minisprites/gen6/pokemon}/0810-000-Grookey.png  | Bin
 .../minisprites/gen6/pokemon}/0811-000-Thwackey.png | Bin
 .../gen6/pokemon}/0812-000-Rillaboom.png            | Bin
 .../gen6/pokemon}/0813-000-Scorbunny.png            | Bin
 .../minisprites/gen6/pokemon}/0814-000-Raboot.png   | Bin
 .../gen6/pokemon}/0815-000-Cinderace.png            | Bin
 .../minisprites/gen6/pokemon}/0816-000-Sobble.png   | Bin
 .../minisprites/gen6/pokemon}/0817-000-Drizzile.png | Bin
 .../minisprites/gen6/pokemon}/0818-000-Inteleon.png | Bin
 .../minisprites/gen6/pokemon}/0819-000-Skwovet.png  | Bin
 .../minisprites/gen6/pokemon}/0820-000-Greedent.png | Bin
 .../minisprites/gen6/pokemon}/0821-000-Rookidee.png | Bin
 .../gen6/pokemon}/0822-000-Corvisquire.png          | Bin
 .../gen6/pokemon}/0823-000-Corviknight.png          | Bin
 .../gen6/pokemon}/0823-420-Corviknight-Gmax.png     | Bin
 .../minisprites/gen6/pokemon}/0824-000-Blipbug.png  | Bin
 .../minisprites/gen6/pokemon}/0825-000-Dottler.png  | Bin
 .../minisprites/gen6/pokemon}/0826-000-Orbeetle.png | Bin
 .../gen6/pokemon}/0826-420-Orbeetle-Gmax.png        | Bin
 .../minisprites/gen6/pokemon}/0827-000-Nickit.png   | Bin
 .../minisprites/gen6/pokemon}/0828-000-Thievul.png  | Bin
 .../gen6/pokemon}/0829-000-Gossifleur.png           | Bin
 .../minisprites/gen6/pokemon}/0830-000-Eldegoss.png | Bin
 .../minisprites/gen6/pokemon}/0831-000-Wooloo.png   | Bin
 .../minisprites/gen6/pokemon}/0832-000-Dubwool.png  | Bin
 .../minisprites/gen6/pokemon}/0833-000-Chewtle.png  | Bin
 .../minisprites/gen6/pokemon}/0834-000-Drednaw.png  | Bin
 .../gen6/pokemon}/0834-420-Drednaw-Gmax.png         | Bin
 .../minisprites/gen6/pokemon}/0835-000-Yamper.png   | Bin
 .../minisprites/gen6/pokemon}/0836-000-Boltund.png  | Bin
 .../minisprites/gen6/pokemon}/0838-000-Carkol.png   | Bin
 .../gen6/pokemon}/0839-000-Coalossal.png            | Bin
 .../gen6/pokemon}/0839-420-Coalossal-Gmax.png       | Bin
 .../minisprites/gen6/pokemon}/0840-000-Applin.png   | Bin
 .../minisprites/gen6/pokemon}/0841-000-Flapple.png  | Bin
 .../gen6/pokemon}/0841-420-Flapple-Gmax.png         | Bin
 .../minisprites/gen6/pokemon}/0842-000-Appletun.png | Bin
 .../gen6/pokemon}/0842-420-Appletun-Gmax.png        | Bin
 .../gen6/pokemon}/0843-000-Silicobra.png            | Bin
 .../gen6/pokemon}/0844-000-Sandaconda.png           | Bin
 .../gen6/pokemon}/0844-420-Sandaconda-Gmax.png      | Bin
 .../gen6/pokemon}/0845-000-Cramorant.png            | Bin
 .../gen6/pokemon}/0845-420-Cramorant-Gorging.png    | Bin
 .../gen6/pokemon}/0845-420-Cramorant-Gulping.png    | Bin
 .../minisprites/gen6/pokemon}/0846-000-Arrokuda.png | Bin
 .../gen6/pokemon}/0847-000-Barraskewda.png          | Bin
 .../minisprites/gen6/pokemon}/0848-000-Toxel.png    | Bin
 .../gen6/pokemon}/0849-000-Toxtricity.png           | Bin
 .../gen6/pokemon}/0849-420-Toxtricity-Gmax.png      | Bin
 .../gen6/pokemon}/0849-420-Toxtricity-Low~Key.png   | Bin
 .../gen6/pokemon}/0850-000-Sizzlipede.png           | Bin
 .../gen6/pokemon}/0851-000-Centiskorch.png          | Bin
 .../gen6/pokemon}/0851-420-Centiskorch-Gmax.png     | Bin
 .../gen6/pokemon}/0852-000-Clobbopus.png            | Bin
 .../gen6/pokemon}/0853-000-Grapploct.png            | Bin
 .../minisprites/gen6/pokemon}/0854-000-Sinistea.png | Bin
 .../gen6/pokemon}/0855-000-Polteageist.png          | Bin
 .../minisprites/gen6/pokemon}/0856-000-Hatenna.png  | Bin
 .../minisprites/gen6/pokemon}/0857-000-Hattrem.png  | Bin
 .../gen6/pokemon}/0858-000-Hatterene.png            | Bin
 .../gen6/pokemon}/0858-420-Hatterene-Gmax.png       | Bin
 .../minisprites/gen6/pokemon}/0859-000-Impidimp.png | Bin
 .../minisprites/gen6/pokemon}/0860-000-Morgrem.png  | Bin
 .../gen6/pokemon}/0861-000-Grimmsnarl.png           | Bin
 .../gen6/pokemon}/0861-420-Grimmsnarl-Gmax.png      | Bin
 .../gen6/pokemon}/0862-000-Obstagoon.png            | Bin
 .../gen6/pokemon}/0863-000-Perrserker.png           | Bin
 .../minisprites/gen6/pokemon}/0864-000-Cursola.png  | Bin
 .../gen6/pokemon}/0865-000-Sirfetch__0027d.png      | Bin
 .../minisprites/gen6/pokemon}/0866-000-Mr._Rime.png | Bin
 .../gen6/pokemon}/0867-000-Runerigus.png            | Bin
 .../minisprites/gen6/pokemon}/0868-000-Milcery.png  | Bin
 .../minisprites/gen6/pokemon}/0869-000-Alcremie.png | Bin
 .../pokemon}/0869-420-Alcremie-Caramel_Swirl.png    | Bin
 .../gen6/pokemon}/0869-420-Alcremie-Gmax.png        | Bin
 .../gen6/pokemon}/0869-420-Alcremie-Lemon_Cream.png | Bin
 .../pokemon}/0869-420-Alcremie-Matcha_Cream.png     | Bin
 .../gen6/pokemon}/0869-420-Alcremie-Mint_Cream.png  | Bin
 .../pokemon}/0869-420-Alcremie-Rainbow_Swirl.png    | Bin
 .../gen6/pokemon}/0869-420-Alcremie-Ruby_Cream.png  | Bin
 .../gen6/pokemon}/0869-420-Alcremie-Ruby_Swirl.png  | Bin
 .../pokemon}/0869-420-Alcremie-Salted_Cream.png     | Bin
 .../minisprites/gen6/pokemon}/0870-000-Falinks.png  | Bin
 .../gen6/pokemon}/0871-000-Pincurchin.png           | Bin
 .../minisprites/gen6/pokemon}/0872-000-Snom.png     | Bin
 .../minisprites/gen6/pokemon}/0873-000-Frosmoth.png | Bin
 .../gen6/pokemon}/0874-000-Stonjourner.png          | Bin
 .../minisprites/gen6/pokemon}/0875-000-Eiscue.png   | Bin
 .../gen6/pokemon}/0875-420-Eiscue-Noice.png         | Bin
 .../minisprites/gen6/pokemon}/0876-000-Indeedee.png | Bin
 .../gen6/pokemon}/0876-420-Indeedee-F.png           | Bin
 .../minisprites/gen6/pokemon}/0877-000-Morpeko.png  | Bin
 .../gen6/pokemon}/0877-420-Morpeko-Hangry.png       | Bin
 .../minisprites/gen6/pokemon}/0878-000-Cufant.png   | Bin
 .../gen6/pokemon}/0879-000-Copperajah.png           | Bin
 .../gen6/pokemon}/0879-420-Copperajah-Gmax.png      | Bin
 .../gen6/pokemon}/0880-000-Dracozolt.png            | Bin
 .../gen6/pokemon}/0881-000-Arctozolt.png            | Bin
 .../gen6/pokemon}/0882-000-Dracovish.png            | Bin
 .../gen6/pokemon}/0883-000-Arctovish.png            | Bin
 .../gen6/pokemon}/0884-000-Duraludon.png            | Bin
 .../gen6/pokemon}/0884-420-Duraludon-Gmax.png       | Bin
 .../minisprites/gen6/pokemon}/0885-000-Dreepy.png   | Bin
 .../minisprites/gen6/pokemon}/0886-000-Drakloak.png | Bin
 .../gen6/pokemon}/0887-000-Dragapult.png            | Bin
 .../minisprites/gen6/pokemon}/0888-000-Zacian.png   | Bin
 .../gen6/pokemon}/0888-420-Zacian-Crowned.png       | Bin
 .../gen6/pokemon}/0889-000-Zamazenta.png            | Bin
 .../gen6/pokemon}/0889-420-Zamazenta-Crowned.png    | Bin
 .../gen6/pokemon}/0890-000-Eternatus.png            | Bin
 .../gen6/pokemon}/0890-420-Eternatus-Eternamax.png  | Bin
 268 files changed, 7 insertions(+), 3 deletions(-)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0003-420-Venusaur-Mega.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0006-420-Charizard-Mega~X.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0006-420-Charizard-Mega~Y.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0009-420-Blastoise-Mega.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0015-420-Beedrill-Mega.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0018-420-Pidgeot-Mega.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0065-420-Alakazam-Mega.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0080-420-Slowbro-Mega.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0094-420-Gengar-Mega.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0115-420-Kangaskhan-Mega.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0127-420-Pinsir-Mega.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0130-420-Gyarados-Mega.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0142-420-Aerodactyl-Mega.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0150-420-Mewtwo-Mega~X.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0150-420-Mewtwo-Mega~Y.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0181-420-Ampharos-Mega.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0208-420-Steelix-Mega.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0212-420-Scizor-Mega.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0214-420-Heracross-Mega.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0229-420-Houndoom-Mega.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0248-420-Tyranitar-Mega.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0254-420-Sceptile-Mega.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0257-420-Blaziken-Mega.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0260-420-Swampert-Mega.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0282-420-Gardevoir-Mega.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0302-420-Sableye-Mega.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0303-420-Mawile-Mega.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0306-420-Aggron-Mega.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0308-420-Medicham-Mega.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0310-420-Manectric-Mega.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0319-420-Sharpedo-Mega.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0323-420-Camerupt-Mega.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0334-420-Altaria-Mega.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0354-420-Banette-Mega.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0359-420-Absol-Mega.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0362-420-Glalie-Mega.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0373-420-Salamence-Mega.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0376-420-Metagross-Mega.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0380-420-Latias-Mega.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0381-420-Latios-Mega.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0382-420-Kyogre-Primal.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0383-420-Groudon-Primal.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0384-420-Rayquaza-Mega.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0428-420-Lopunny-Mega.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0445-420-Garchomp-Mega.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0448-420-Lucario-Mega.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0460-420-Abomasnow-Mega.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0475-420-Gallade-Mega.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0531-420-Audino-Mega.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0650-000-Chespin.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0651-000-Quilladin.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0652-000-Chesnaught.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0653-000-Fennekin.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0654-000-Braixen.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0655-000-Delphox.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0656-000-Froakie.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0657-000-Frogadier.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0658-000-Greninja.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0659-000-Bunnelby.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0660-000-Diggersby.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0661-000-Fletchling.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0662-000-Fletchinder.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0663-000-Talonflame.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0664-000-Scatterbug.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0665-000-Spewpa.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0666-000-Vivillon.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0667-000-Litleo.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0668-000-Pyroar.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0669-000-Flabe__0301be__0301.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0670-000-Floette.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0670-420-Floette-Eternal.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0671-000-Florges.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0672-000-Skiddo.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0673-000-Gogoat.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0674-000-Pancham.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0675-000-Pangoro.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0676-000-Furfrou.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0677-000-Espurr.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0678-000-Meowstic.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0678-420-Meowstic-F.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0679-000-Honedge.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0680-000-Doublade.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0681-000-Aegislash.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0682-000-Spritzee.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0683-000-Aromatisse.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0684-000-Swirlix.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0685-000-Slurpuff.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0686-000-Inkay.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0687-000-Malamar.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0688-000-Binacle.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0689-000-Barbaracle.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0690-000-Skrelp.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0691-000-Dragalge.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0692-000-Clauncher.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0693-000-Clawitzer.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0694-000-Helioptile.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0695-000-Heliolisk.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0696-000-Tyrunt.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0697-000-Tyrantrum.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0698-000-Amaura.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0699-000-Aurorus.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0700-000-Sylveon.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0701-000-Hawlucha.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0702-000-Dedenne.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0703-000-Carbink.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0704-000-Goomy.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0705-000-Sliggoo.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0706-000-Goodra.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0707-000-Klefki.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0708-000-Phantump.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0709-000-Trevenant.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0710-000-Pumpkaboo.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0711-000-Gourgeist.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0712-000-Bergmite.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0713-000-Avalugg.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0714-000-Noibat.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0715-000-Noivern.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0716-000-Xerneas.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0717-000-Yveltal.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0718-000-Zygarde.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0719-000-Diancie.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0719-420-Diancie-Mega.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0720-000-Hoopa.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0720-420-Hoopa-Unbound.png (100%)
 rename src/{canonical/minisprites/gen5/custom => noncanonical/minisprites/gen5/pokemon}/0721-000-Volcanion.png (100%)
 rename src/{cap/minisprites/gen6/custom => noncanonical/minisprites/gen6/asymmetrical}/README.md (100%)
 create mode 100644 src/noncanonical/minisprites/gen6/misc/README.md
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0006-420-Charizard-Gmax.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0012-420-Butterfree-Gmax.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0025-420-Pikachu-Gmax.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0052-420-Meowth-Galar.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0052-420-Meowth-Gmax.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0068-420-Machamp-Gmax.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0077-420-Ponyta-Galar.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0078-420-Rapidash-Galar.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0079-420-Slowpoke-Galar.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0083-420-Farfetch__0027d-Galar.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0094-420-Gengar-Gmax.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0099-420-Kingler-Gmax.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0110-420-Weezing-Galar.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0122-420-Mr._Mime-Galar.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0131-420-Lapras-Gmax.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0133-420-Eevee-Gmax.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0143-420-Snorlax-Gmax.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0222-420-Corsola-Galar.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0263-420-Zigzagoon-Galar.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0264-420-Linoone-Galar.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0554-420-Darumaka-Galar.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0555-420-Darmanitan-Galar.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0555-420-Darmanitan-Galar~Zen.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0562-420-Yamask-Galar.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0569-420-Garbodor-Gmax.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0618-420-Stunfisk-Galar.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0809-000-Melmetal.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0809-420-Melmetal-Gmax.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0810-000-Grookey.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0811-000-Thwackey.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0812-000-Rillaboom.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0813-000-Scorbunny.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0814-000-Raboot.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0815-000-Cinderace.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0816-000-Sobble.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0817-000-Drizzile.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0818-000-Inteleon.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0819-000-Skwovet.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0820-000-Greedent.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0821-000-Rookidee.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0822-000-Corvisquire.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0823-000-Corviknight.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0823-420-Corviknight-Gmax.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0824-000-Blipbug.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0825-000-Dottler.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0826-000-Orbeetle.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0826-420-Orbeetle-Gmax.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0827-000-Nickit.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0828-000-Thievul.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0829-000-Gossifleur.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0830-000-Eldegoss.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0831-000-Wooloo.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0832-000-Dubwool.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0833-000-Chewtle.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0834-000-Drednaw.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0834-420-Drednaw-Gmax.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0835-000-Yamper.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0836-000-Boltund.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0838-000-Carkol.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0839-000-Coalossal.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0839-420-Coalossal-Gmax.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0840-000-Applin.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0841-000-Flapple.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0841-420-Flapple-Gmax.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0842-000-Appletun.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0842-420-Appletun-Gmax.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0843-000-Silicobra.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0844-000-Sandaconda.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0844-420-Sandaconda-Gmax.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0845-000-Cramorant.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0845-420-Cramorant-Gorging.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0845-420-Cramorant-Gulping.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0846-000-Arrokuda.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0847-000-Barraskewda.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0848-000-Toxel.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0849-000-Toxtricity.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0849-420-Toxtricity-Gmax.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0849-420-Toxtricity-Low~Key.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0850-000-Sizzlipede.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0851-000-Centiskorch.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0851-420-Centiskorch-Gmax.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0852-000-Clobbopus.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0853-000-Grapploct.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0854-000-Sinistea.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0855-000-Polteageist.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0856-000-Hatenna.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0857-000-Hattrem.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0858-000-Hatterene.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0858-420-Hatterene-Gmax.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0859-000-Impidimp.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0860-000-Morgrem.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0861-000-Grimmsnarl.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0861-420-Grimmsnarl-Gmax.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0862-000-Obstagoon.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0863-000-Perrserker.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0864-000-Cursola.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0865-000-Sirfetch__0027d.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0866-000-Mr._Rime.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0867-000-Runerigus.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0868-000-Milcery.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0869-000-Alcremie.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0869-420-Alcremie-Caramel_Swirl.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0869-420-Alcremie-Gmax.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0869-420-Alcremie-Lemon_Cream.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0869-420-Alcremie-Matcha_Cream.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0869-420-Alcremie-Mint_Cream.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0869-420-Alcremie-Rainbow_Swirl.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0869-420-Alcremie-Ruby_Cream.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0869-420-Alcremie-Ruby_Swirl.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0869-420-Alcremie-Salted_Cream.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0870-000-Falinks.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0871-000-Pincurchin.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0872-000-Snom.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0873-000-Frosmoth.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0874-000-Stonjourner.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0875-000-Eiscue.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0875-420-Eiscue-Noice.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0876-000-Indeedee.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0876-420-Indeedee-F.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0877-000-Morpeko.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0877-420-Morpeko-Hangry.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0878-000-Cufant.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0879-000-Copperajah.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0879-420-Copperajah-Gmax.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0880-000-Dracozolt.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0881-000-Arctozolt.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0882-000-Dracovish.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0883-000-Arctovish.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0884-000-Duraludon.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0884-420-Duraludon-Gmax.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0885-000-Dreepy.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0886-000-Drakloak.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0887-000-Dragapult.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0888-000-Zacian.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0888-420-Zacian-Crowned.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0889-000-Zamazenta.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0889-420-Zamazenta-Crowned.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0890-000-Eternatus.png (100%)
 rename src/{canonical/minisprites/gen6/custom => noncanonical/minisprites/gen6/pokemon}/0890-420-Eternatus-Eternamax.png (100%)

diff --git a/Tupfile.lua b/Tupfile.lua
index f907450c..364b8b7e 100644
--- a/Tupfile.lua
+++ b/Tupfile.lua
@@ -7,8 +7,8 @@ foreach_rule{
     command=pad{w=40, h=30},
     output="build/gen6-minisprites-padded/%{canon}/%{dir}/%b",
     dimensions={
-        canon={"canonical", "cap"},
-        dir={"asymmetrical", "custom", "misc", "pokemon"}
+        canon={"canonical", "noncanonical", "cap"},
+        dir={"asymmetrical", "misc", "pokemon"}
     }
 }
 
@@ -16,7 +16,9 @@ foreach_rule{
 
 rule{
     input={"build/gen6-minisprites-padded/canonical/pokemon/*",
-           "build/gen6-minisprites-padded/cap/pokemon/*"},
+           "build/gen6-minisprites-padded/cap/pokemon/*",
+           "build/gen6-minisprites-padded/noncanonical/pokemon/*",
+    },
     command="node tools/sprites/ps.js build/gen6-minisprites-padded/canonical/pokemon/ build/gen6-minisprites-padded/cap/pokemon/ --output-image build/ps/pokemonicons-sheet.png --output-metadata build/ps/pokemonicons.json",
     output={"build/ps/pokemonicons-sheet.png",
             "build/ps/pokemonicons.json"}
diff --git a/smogon.deploy.js b/smogon.deploy.js
index c981cc8d..9b06be5b 100644
--- a/smogon.deploy.js
+++ b/smogon.deploy.js
@@ -2,6 +2,7 @@
 transform(toSmogonSpriteAlias, () => {
     dest("forumsprites");
     sel(
+        "build/gen6-minisprites-padded/noncanonical/pokemon",
         "build/gen6-minisprites-padded/canonical/pokemon",
         "build/gen6-minisprites-padded/cap/pokemon"
     );
diff --git a/src/canonical/minisprites/gen5/custom/0003-420-Venusaur-Mega.png b/src/noncanonical/minisprites/gen5/pokemon/0003-420-Venusaur-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0003-420-Venusaur-Mega.png
rename to src/noncanonical/minisprites/gen5/pokemon/0003-420-Venusaur-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0006-420-Charizard-Mega~X.png b/src/noncanonical/minisprites/gen5/pokemon/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/noncanonical/minisprites/gen5/pokemon/0006-420-Charizard-Mega~X.png
diff --git a/src/canonical/minisprites/gen5/custom/0006-420-Charizard-Mega~Y.png b/src/noncanonical/minisprites/gen5/pokemon/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/noncanonical/minisprites/gen5/pokemon/0006-420-Charizard-Mega~Y.png
diff --git a/src/canonical/minisprites/gen5/custom/0009-420-Blastoise-Mega.png b/src/noncanonical/minisprites/gen5/pokemon/0009-420-Blastoise-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0009-420-Blastoise-Mega.png
rename to src/noncanonical/minisprites/gen5/pokemon/0009-420-Blastoise-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0015-420-Beedrill-Mega.png b/src/noncanonical/minisprites/gen5/pokemon/0015-420-Beedrill-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0015-420-Beedrill-Mega.png
rename to src/noncanonical/minisprites/gen5/pokemon/0015-420-Beedrill-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0018-420-Pidgeot-Mega.png b/src/noncanonical/minisprites/gen5/pokemon/0018-420-Pidgeot-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0018-420-Pidgeot-Mega.png
rename to src/noncanonical/minisprites/gen5/pokemon/0018-420-Pidgeot-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0065-420-Alakazam-Mega.png b/src/noncanonical/minisprites/gen5/pokemon/0065-420-Alakazam-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0065-420-Alakazam-Mega.png
rename to src/noncanonical/minisprites/gen5/pokemon/0065-420-Alakazam-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0080-420-Slowbro-Mega.png b/src/noncanonical/minisprites/gen5/pokemon/0080-420-Slowbro-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0080-420-Slowbro-Mega.png
rename to src/noncanonical/minisprites/gen5/pokemon/0080-420-Slowbro-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0094-420-Gengar-Mega.png b/src/noncanonical/minisprites/gen5/pokemon/0094-420-Gengar-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0094-420-Gengar-Mega.png
rename to src/noncanonical/minisprites/gen5/pokemon/0094-420-Gengar-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0115-420-Kangaskhan-Mega.png b/src/noncanonical/minisprites/gen5/pokemon/0115-420-Kangaskhan-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0115-420-Kangaskhan-Mega.png
rename to src/noncanonical/minisprites/gen5/pokemon/0115-420-Kangaskhan-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0127-420-Pinsir-Mega.png b/src/noncanonical/minisprites/gen5/pokemon/0127-420-Pinsir-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0127-420-Pinsir-Mega.png
rename to src/noncanonical/minisprites/gen5/pokemon/0127-420-Pinsir-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0130-420-Gyarados-Mega.png b/src/noncanonical/minisprites/gen5/pokemon/0130-420-Gyarados-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0130-420-Gyarados-Mega.png
rename to src/noncanonical/minisprites/gen5/pokemon/0130-420-Gyarados-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0142-420-Aerodactyl-Mega.png b/src/noncanonical/minisprites/gen5/pokemon/0142-420-Aerodactyl-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0142-420-Aerodactyl-Mega.png
rename to src/noncanonical/minisprites/gen5/pokemon/0142-420-Aerodactyl-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0150-420-Mewtwo-Mega~X.png b/src/noncanonical/minisprites/gen5/pokemon/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/noncanonical/minisprites/gen5/pokemon/0150-420-Mewtwo-Mega~X.png
diff --git a/src/canonical/minisprites/gen5/custom/0150-420-Mewtwo-Mega~Y.png b/src/noncanonical/minisprites/gen5/pokemon/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/noncanonical/minisprites/gen5/pokemon/0150-420-Mewtwo-Mega~Y.png
diff --git a/src/canonical/minisprites/gen5/custom/0181-420-Ampharos-Mega.png b/src/noncanonical/minisprites/gen5/pokemon/0181-420-Ampharos-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0181-420-Ampharos-Mega.png
rename to src/noncanonical/minisprites/gen5/pokemon/0181-420-Ampharos-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0208-420-Steelix-Mega.png b/src/noncanonical/minisprites/gen5/pokemon/0208-420-Steelix-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0208-420-Steelix-Mega.png
rename to src/noncanonical/minisprites/gen5/pokemon/0208-420-Steelix-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0212-420-Scizor-Mega.png b/src/noncanonical/minisprites/gen5/pokemon/0212-420-Scizor-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0212-420-Scizor-Mega.png
rename to src/noncanonical/minisprites/gen5/pokemon/0212-420-Scizor-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0214-420-Heracross-Mega.png b/src/noncanonical/minisprites/gen5/pokemon/0214-420-Heracross-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0214-420-Heracross-Mega.png
rename to src/noncanonical/minisprites/gen5/pokemon/0214-420-Heracross-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0229-420-Houndoom-Mega.png b/src/noncanonical/minisprites/gen5/pokemon/0229-420-Houndoom-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0229-420-Houndoom-Mega.png
rename to src/noncanonical/minisprites/gen5/pokemon/0229-420-Houndoom-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0248-420-Tyranitar-Mega.png b/src/noncanonical/minisprites/gen5/pokemon/0248-420-Tyranitar-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0248-420-Tyranitar-Mega.png
rename to src/noncanonical/minisprites/gen5/pokemon/0248-420-Tyranitar-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0254-420-Sceptile-Mega.png b/src/noncanonical/minisprites/gen5/pokemon/0254-420-Sceptile-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0254-420-Sceptile-Mega.png
rename to src/noncanonical/minisprites/gen5/pokemon/0254-420-Sceptile-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0257-420-Blaziken-Mega.png b/src/noncanonical/minisprites/gen5/pokemon/0257-420-Blaziken-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0257-420-Blaziken-Mega.png
rename to src/noncanonical/minisprites/gen5/pokemon/0257-420-Blaziken-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0260-420-Swampert-Mega.png b/src/noncanonical/minisprites/gen5/pokemon/0260-420-Swampert-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0260-420-Swampert-Mega.png
rename to src/noncanonical/minisprites/gen5/pokemon/0260-420-Swampert-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0282-420-Gardevoir-Mega.png b/src/noncanonical/minisprites/gen5/pokemon/0282-420-Gardevoir-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0282-420-Gardevoir-Mega.png
rename to src/noncanonical/minisprites/gen5/pokemon/0282-420-Gardevoir-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0302-420-Sableye-Mega.png b/src/noncanonical/minisprites/gen5/pokemon/0302-420-Sableye-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0302-420-Sableye-Mega.png
rename to src/noncanonical/minisprites/gen5/pokemon/0302-420-Sableye-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0303-420-Mawile-Mega.png b/src/noncanonical/minisprites/gen5/pokemon/0303-420-Mawile-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0303-420-Mawile-Mega.png
rename to src/noncanonical/minisprites/gen5/pokemon/0303-420-Mawile-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0306-420-Aggron-Mega.png b/src/noncanonical/minisprites/gen5/pokemon/0306-420-Aggron-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0306-420-Aggron-Mega.png
rename to src/noncanonical/minisprites/gen5/pokemon/0306-420-Aggron-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0308-420-Medicham-Mega.png b/src/noncanonical/minisprites/gen5/pokemon/0308-420-Medicham-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0308-420-Medicham-Mega.png
rename to src/noncanonical/minisprites/gen5/pokemon/0308-420-Medicham-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0310-420-Manectric-Mega.png b/src/noncanonical/minisprites/gen5/pokemon/0310-420-Manectric-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0310-420-Manectric-Mega.png
rename to src/noncanonical/minisprites/gen5/pokemon/0310-420-Manectric-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0319-420-Sharpedo-Mega.png b/src/noncanonical/minisprites/gen5/pokemon/0319-420-Sharpedo-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0319-420-Sharpedo-Mega.png
rename to src/noncanonical/minisprites/gen5/pokemon/0319-420-Sharpedo-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0323-420-Camerupt-Mega.png b/src/noncanonical/minisprites/gen5/pokemon/0323-420-Camerupt-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0323-420-Camerupt-Mega.png
rename to src/noncanonical/minisprites/gen5/pokemon/0323-420-Camerupt-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0334-420-Altaria-Mega.png b/src/noncanonical/minisprites/gen5/pokemon/0334-420-Altaria-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0334-420-Altaria-Mega.png
rename to src/noncanonical/minisprites/gen5/pokemon/0334-420-Altaria-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0354-420-Banette-Mega.png b/src/noncanonical/minisprites/gen5/pokemon/0354-420-Banette-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0354-420-Banette-Mega.png
rename to src/noncanonical/minisprites/gen5/pokemon/0354-420-Banette-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0359-420-Absol-Mega.png b/src/noncanonical/minisprites/gen5/pokemon/0359-420-Absol-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0359-420-Absol-Mega.png
rename to src/noncanonical/minisprites/gen5/pokemon/0359-420-Absol-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0362-420-Glalie-Mega.png b/src/noncanonical/minisprites/gen5/pokemon/0362-420-Glalie-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0362-420-Glalie-Mega.png
rename to src/noncanonical/minisprites/gen5/pokemon/0362-420-Glalie-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0373-420-Salamence-Mega.png b/src/noncanonical/minisprites/gen5/pokemon/0373-420-Salamence-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0373-420-Salamence-Mega.png
rename to src/noncanonical/minisprites/gen5/pokemon/0373-420-Salamence-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0376-420-Metagross-Mega.png b/src/noncanonical/minisprites/gen5/pokemon/0376-420-Metagross-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0376-420-Metagross-Mega.png
rename to src/noncanonical/minisprites/gen5/pokemon/0376-420-Metagross-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0380-420-Latias-Mega.png b/src/noncanonical/minisprites/gen5/pokemon/0380-420-Latias-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0380-420-Latias-Mega.png
rename to src/noncanonical/minisprites/gen5/pokemon/0380-420-Latias-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0381-420-Latios-Mega.png b/src/noncanonical/minisprites/gen5/pokemon/0381-420-Latios-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0381-420-Latios-Mega.png
rename to src/noncanonical/minisprites/gen5/pokemon/0381-420-Latios-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0382-420-Kyogre-Primal.png b/src/noncanonical/minisprites/gen5/pokemon/0382-420-Kyogre-Primal.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0382-420-Kyogre-Primal.png
rename to src/noncanonical/minisprites/gen5/pokemon/0382-420-Kyogre-Primal.png
diff --git a/src/canonical/minisprites/gen5/custom/0383-420-Groudon-Primal.png b/src/noncanonical/minisprites/gen5/pokemon/0383-420-Groudon-Primal.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0383-420-Groudon-Primal.png
rename to src/noncanonical/minisprites/gen5/pokemon/0383-420-Groudon-Primal.png
diff --git a/src/canonical/minisprites/gen5/custom/0384-420-Rayquaza-Mega.png b/src/noncanonical/minisprites/gen5/pokemon/0384-420-Rayquaza-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0384-420-Rayquaza-Mega.png
rename to src/noncanonical/minisprites/gen5/pokemon/0384-420-Rayquaza-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0428-420-Lopunny-Mega.png b/src/noncanonical/minisprites/gen5/pokemon/0428-420-Lopunny-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0428-420-Lopunny-Mega.png
rename to src/noncanonical/minisprites/gen5/pokemon/0428-420-Lopunny-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0445-420-Garchomp-Mega.png b/src/noncanonical/minisprites/gen5/pokemon/0445-420-Garchomp-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0445-420-Garchomp-Mega.png
rename to src/noncanonical/minisprites/gen5/pokemon/0445-420-Garchomp-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0448-420-Lucario-Mega.png b/src/noncanonical/minisprites/gen5/pokemon/0448-420-Lucario-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0448-420-Lucario-Mega.png
rename to src/noncanonical/minisprites/gen5/pokemon/0448-420-Lucario-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0460-420-Abomasnow-Mega.png b/src/noncanonical/minisprites/gen5/pokemon/0460-420-Abomasnow-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0460-420-Abomasnow-Mega.png
rename to src/noncanonical/minisprites/gen5/pokemon/0460-420-Abomasnow-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0475-420-Gallade-Mega.png b/src/noncanonical/minisprites/gen5/pokemon/0475-420-Gallade-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0475-420-Gallade-Mega.png
rename to src/noncanonical/minisprites/gen5/pokemon/0475-420-Gallade-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0531-420-Audino-Mega.png b/src/noncanonical/minisprites/gen5/pokemon/0531-420-Audino-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0531-420-Audino-Mega.png
rename to src/noncanonical/minisprites/gen5/pokemon/0531-420-Audino-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0650-000-Chespin.png b/src/noncanonical/minisprites/gen5/pokemon/0650-000-Chespin.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0650-000-Chespin.png
rename to src/noncanonical/minisprites/gen5/pokemon/0650-000-Chespin.png
diff --git a/src/canonical/minisprites/gen5/custom/0651-000-Quilladin.png b/src/noncanonical/minisprites/gen5/pokemon/0651-000-Quilladin.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0651-000-Quilladin.png
rename to src/noncanonical/minisprites/gen5/pokemon/0651-000-Quilladin.png
diff --git a/src/canonical/minisprites/gen5/custom/0652-000-Chesnaught.png b/src/noncanonical/minisprites/gen5/pokemon/0652-000-Chesnaught.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0652-000-Chesnaught.png
rename to src/noncanonical/minisprites/gen5/pokemon/0652-000-Chesnaught.png
diff --git a/src/canonical/minisprites/gen5/custom/0653-000-Fennekin.png b/src/noncanonical/minisprites/gen5/pokemon/0653-000-Fennekin.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0653-000-Fennekin.png
rename to src/noncanonical/minisprites/gen5/pokemon/0653-000-Fennekin.png
diff --git a/src/canonical/minisprites/gen5/custom/0654-000-Braixen.png b/src/noncanonical/minisprites/gen5/pokemon/0654-000-Braixen.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0654-000-Braixen.png
rename to src/noncanonical/minisprites/gen5/pokemon/0654-000-Braixen.png
diff --git a/src/canonical/minisprites/gen5/custom/0655-000-Delphox.png b/src/noncanonical/minisprites/gen5/pokemon/0655-000-Delphox.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0655-000-Delphox.png
rename to src/noncanonical/minisprites/gen5/pokemon/0655-000-Delphox.png
diff --git a/src/canonical/minisprites/gen5/custom/0656-000-Froakie.png b/src/noncanonical/minisprites/gen5/pokemon/0656-000-Froakie.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0656-000-Froakie.png
rename to src/noncanonical/minisprites/gen5/pokemon/0656-000-Froakie.png
diff --git a/src/canonical/minisprites/gen5/custom/0657-000-Frogadier.png b/src/noncanonical/minisprites/gen5/pokemon/0657-000-Frogadier.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0657-000-Frogadier.png
rename to src/noncanonical/minisprites/gen5/pokemon/0657-000-Frogadier.png
diff --git a/src/canonical/minisprites/gen5/custom/0658-000-Greninja.png b/src/noncanonical/minisprites/gen5/pokemon/0658-000-Greninja.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0658-000-Greninja.png
rename to src/noncanonical/minisprites/gen5/pokemon/0658-000-Greninja.png
diff --git a/src/canonical/minisprites/gen5/custom/0659-000-Bunnelby.png b/src/noncanonical/minisprites/gen5/pokemon/0659-000-Bunnelby.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0659-000-Bunnelby.png
rename to src/noncanonical/minisprites/gen5/pokemon/0659-000-Bunnelby.png
diff --git a/src/canonical/minisprites/gen5/custom/0660-000-Diggersby.png b/src/noncanonical/minisprites/gen5/pokemon/0660-000-Diggersby.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0660-000-Diggersby.png
rename to src/noncanonical/minisprites/gen5/pokemon/0660-000-Diggersby.png
diff --git a/src/canonical/minisprites/gen5/custom/0661-000-Fletchling.png b/src/noncanonical/minisprites/gen5/pokemon/0661-000-Fletchling.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0661-000-Fletchling.png
rename to src/noncanonical/minisprites/gen5/pokemon/0661-000-Fletchling.png
diff --git a/src/canonical/minisprites/gen5/custom/0662-000-Fletchinder.png b/src/noncanonical/minisprites/gen5/pokemon/0662-000-Fletchinder.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0662-000-Fletchinder.png
rename to src/noncanonical/minisprites/gen5/pokemon/0662-000-Fletchinder.png
diff --git a/src/canonical/minisprites/gen5/custom/0663-000-Talonflame.png b/src/noncanonical/minisprites/gen5/pokemon/0663-000-Talonflame.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0663-000-Talonflame.png
rename to src/noncanonical/minisprites/gen5/pokemon/0663-000-Talonflame.png
diff --git a/src/canonical/minisprites/gen5/custom/0664-000-Scatterbug.png b/src/noncanonical/minisprites/gen5/pokemon/0664-000-Scatterbug.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0664-000-Scatterbug.png
rename to src/noncanonical/minisprites/gen5/pokemon/0664-000-Scatterbug.png
diff --git a/src/canonical/minisprites/gen5/custom/0665-000-Spewpa.png b/src/noncanonical/minisprites/gen5/pokemon/0665-000-Spewpa.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0665-000-Spewpa.png
rename to src/noncanonical/minisprites/gen5/pokemon/0665-000-Spewpa.png
diff --git a/src/canonical/minisprites/gen5/custom/0666-000-Vivillon.png b/src/noncanonical/minisprites/gen5/pokemon/0666-000-Vivillon.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0666-000-Vivillon.png
rename to src/noncanonical/minisprites/gen5/pokemon/0666-000-Vivillon.png
diff --git a/src/canonical/minisprites/gen5/custom/0667-000-Litleo.png b/src/noncanonical/minisprites/gen5/pokemon/0667-000-Litleo.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0667-000-Litleo.png
rename to src/noncanonical/minisprites/gen5/pokemon/0667-000-Litleo.png
diff --git a/src/canonical/minisprites/gen5/custom/0668-000-Pyroar.png b/src/noncanonical/minisprites/gen5/pokemon/0668-000-Pyroar.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0668-000-Pyroar.png
rename to src/noncanonical/minisprites/gen5/pokemon/0668-000-Pyroar.png
diff --git a/src/canonical/minisprites/gen5/custom/0669-000-Flabe__0301be__0301.png b/src/noncanonical/minisprites/gen5/pokemon/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/noncanonical/minisprites/gen5/pokemon/0669-000-Flabe__0301be__0301.png
diff --git a/src/canonical/minisprites/gen5/custom/0670-000-Floette.png b/src/noncanonical/minisprites/gen5/pokemon/0670-000-Floette.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0670-000-Floette.png
rename to src/noncanonical/minisprites/gen5/pokemon/0670-000-Floette.png
diff --git a/src/canonical/minisprites/gen5/custom/0670-420-Floette-Eternal.png b/src/noncanonical/minisprites/gen5/pokemon/0670-420-Floette-Eternal.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0670-420-Floette-Eternal.png
rename to src/noncanonical/minisprites/gen5/pokemon/0670-420-Floette-Eternal.png
diff --git a/src/canonical/minisprites/gen5/custom/0671-000-Florges.png b/src/noncanonical/minisprites/gen5/pokemon/0671-000-Florges.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0671-000-Florges.png
rename to src/noncanonical/minisprites/gen5/pokemon/0671-000-Florges.png
diff --git a/src/canonical/minisprites/gen5/custom/0672-000-Skiddo.png b/src/noncanonical/minisprites/gen5/pokemon/0672-000-Skiddo.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0672-000-Skiddo.png
rename to src/noncanonical/minisprites/gen5/pokemon/0672-000-Skiddo.png
diff --git a/src/canonical/minisprites/gen5/custom/0673-000-Gogoat.png b/src/noncanonical/minisprites/gen5/pokemon/0673-000-Gogoat.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0673-000-Gogoat.png
rename to src/noncanonical/minisprites/gen5/pokemon/0673-000-Gogoat.png
diff --git a/src/canonical/minisprites/gen5/custom/0674-000-Pancham.png b/src/noncanonical/minisprites/gen5/pokemon/0674-000-Pancham.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0674-000-Pancham.png
rename to src/noncanonical/minisprites/gen5/pokemon/0674-000-Pancham.png
diff --git a/src/canonical/minisprites/gen5/custom/0675-000-Pangoro.png b/src/noncanonical/minisprites/gen5/pokemon/0675-000-Pangoro.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0675-000-Pangoro.png
rename to src/noncanonical/minisprites/gen5/pokemon/0675-000-Pangoro.png
diff --git a/src/canonical/minisprites/gen5/custom/0676-000-Furfrou.png b/src/noncanonical/minisprites/gen5/pokemon/0676-000-Furfrou.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0676-000-Furfrou.png
rename to src/noncanonical/minisprites/gen5/pokemon/0676-000-Furfrou.png
diff --git a/src/canonical/minisprites/gen5/custom/0677-000-Espurr.png b/src/noncanonical/minisprites/gen5/pokemon/0677-000-Espurr.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0677-000-Espurr.png
rename to src/noncanonical/minisprites/gen5/pokemon/0677-000-Espurr.png
diff --git a/src/canonical/minisprites/gen5/custom/0678-000-Meowstic.png b/src/noncanonical/minisprites/gen5/pokemon/0678-000-Meowstic.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0678-000-Meowstic.png
rename to src/noncanonical/minisprites/gen5/pokemon/0678-000-Meowstic.png
diff --git a/src/canonical/minisprites/gen5/custom/0678-420-Meowstic-F.png b/src/noncanonical/minisprites/gen5/pokemon/0678-420-Meowstic-F.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0678-420-Meowstic-F.png
rename to src/noncanonical/minisprites/gen5/pokemon/0678-420-Meowstic-F.png
diff --git a/src/canonical/minisprites/gen5/custom/0679-000-Honedge.png b/src/noncanonical/minisprites/gen5/pokemon/0679-000-Honedge.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0679-000-Honedge.png
rename to src/noncanonical/minisprites/gen5/pokemon/0679-000-Honedge.png
diff --git a/src/canonical/minisprites/gen5/custom/0680-000-Doublade.png b/src/noncanonical/minisprites/gen5/pokemon/0680-000-Doublade.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0680-000-Doublade.png
rename to src/noncanonical/minisprites/gen5/pokemon/0680-000-Doublade.png
diff --git a/src/canonical/minisprites/gen5/custom/0681-000-Aegislash.png b/src/noncanonical/minisprites/gen5/pokemon/0681-000-Aegislash.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0681-000-Aegislash.png
rename to src/noncanonical/minisprites/gen5/pokemon/0681-000-Aegislash.png
diff --git a/src/canonical/minisprites/gen5/custom/0682-000-Spritzee.png b/src/noncanonical/minisprites/gen5/pokemon/0682-000-Spritzee.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0682-000-Spritzee.png
rename to src/noncanonical/minisprites/gen5/pokemon/0682-000-Spritzee.png
diff --git a/src/canonical/minisprites/gen5/custom/0683-000-Aromatisse.png b/src/noncanonical/minisprites/gen5/pokemon/0683-000-Aromatisse.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0683-000-Aromatisse.png
rename to src/noncanonical/minisprites/gen5/pokemon/0683-000-Aromatisse.png
diff --git a/src/canonical/minisprites/gen5/custom/0684-000-Swirlix.png b/src/noncanonical/minisprites/gen5/pokemon/0684-000-Swirlix.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0684-000-Swirlix.png
rename to src/noncanonical/minisprites/gen5/pokemon/0684-000-Swirlix.png
diff --git a/src/canonical/minisprites/gen5/custom/0685-000-Slurpuff.png b/src/noncanonical/minisprites/gen5/pokemon/0685-000-Slurpuff.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0685-000-Slurpuff.png
rename to src/noncanonical/minisprites/gen5/pokemon/0685-000-Slurpuff.png
diff --git a/src/canonical/minisprites/gen5/custom/0686-000-Inkay.png b/src/noncanonical/minisprites/gen5/pokemon/0686-000-Inkay.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0686-000-Inkay.png
rename to src/noncanonical/minisprites/gen5/pokemon/0686-000-Inkay.png
diff --git a/src/canonical/minisprites/gen5/custom/0687-000-Malamar.png b/src/noncanonical/minisprites/gen5/pokemon/0687-000-Malamar.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0687-000-Malamar.png
rename to src/noncanonical/minisprites/gen5/pokemon/0687-000-Malamar.png
diff --git a/src/canonical/minisprites/gen5/custom/0688-000-Binacle.png b/src/noncanonical/minisprites/gen5/pokemon/0688-000-Binacle.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0688-000-Binacle.png
rename to src/noncanonical/minisprites/gen5/pokemon/0688-000-Binacle.png
diff --git a/src/canonical/minisprites/gen5/custom/0689-000-Barbaracle.png b/src/noncanonical/minisprites/gen5/pokemon/0689-000-Barbaracle.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0689-000-Barbaracle.png
rename to src/noncanonical/minisprites/gen5/pokemon/0689-000-Barbaracle.png
diff --git a/src/canonical/minisprites/gen5/custom/0690-000-Skrelp.png b/src/noncanonical/minisprites/gen5/pokemon/0690-000-Skrelp.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0690-000-Skrelp.png
rename to src/noncanonical/minisprites/gen5/pokemon/0690-000-Skrelp.png
diff --git a/src/canonical/minisprites/gen5/custom/0691-000-Dragalge.png b/src/noncanonical/minisprites/gen5/pokemon/0691-000-Dragalge.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0691-000-Dragalge.png
rename to src/noncanonical/minisprites/gen5/pokemon/0691-000-Dragalge.png
diff --git a/src/canonical/minisprites/gen5/custom/0692-000-Clauncher.png b/src/noncanonical/minisprites/gen5/pokemon/0692-000-Clauncher.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0692-000-Clauncher.png
rename to src/noncanonical/minisprites/gen5/pokemon/0692-000-Clauncher.png
diff --git a/src/canonical/minisprites/gen5/custom/0693-000-Clawitzer.png b/src/noncanonical/minisprites/gen5/pokemon/0693-000-Clawitzer.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0693-000-Clawitzer.png
rename to src/noncanonical/minisprites/gen5/pokemon/0693-000-Clawitzer.png
diff --git a/src/canonical/minisprites/gen5/custom/0694-000-Helioptile.png b/src/noncanonical/minisprites/gen5/pokemon/0694-000-Helioptile.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0694-000-Helioptile.png
rename to src/noncanonical/minisprites/gen5/pokemon/0694-000-Helioptile.png
diff --git a/src/canonical/minisprites/gen5/custom/0695-000-Heliolisk.png b/src/noncanonical/minisprites/gen5/pokemon/0695-000-Heliolisk.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0695-000-Heliolisk.png
rename to src/noncanonical/minisprites/gen5/pokemon/0695-000-Heliolisk.png
diff --git a/src/canonical/minisprites/gen5/custom/0696-000-Tyrunt.png b/src/noncanonical/minisprites/gen5/pokemon/0696-000-Tyrunt.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0696-000-Tyrunt.png
rename to src/noncanonical/minisprites/gen5/pokemon/0696-000-Tyrunt.png
diff --git a/src/canonical/minisprites/gen5/custom/0697-000-Tyrantrum.png b/src/noncanonical/minisprites/gen5/pokemon/0697-000-Tyrantrum.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0697-000-Tyrantrum.png
rename to src/noncanonical/minisprites/gen5/pokemon/0697-000-Tyrantrum.png
diff --git a/src/canonical/minisprites/gen5/custom/0698-000-Amaura.png b/src/noncanonical/minisprites/gen5/pokemon/0698-000-Amaura.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0698-000-Amaura.png
rename to src/noncanonical/minisprites/gen5/pokemon/0698-000-Amaura.png
diff --git a/src/canonical/minisprites/gen5/custom/0699-000-Aurorus.png b/src/noncanonical/minisprites/gen5/pokemon/0699-000-Aurorus.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0699-000-Aurorus.png
rename to src/noncanonical/minisprites/gen5/pokemon/0699-000-Aurorus.png
diff --git a/src/canonical/minisprites/gen5/custom/0700-000-Sylveon.png b/src/noncanonical/minisprites/gen5/pokemon/0700-000-Sylveon.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0700-000-Sylveon.png
rename to src/noncanonical/minisprites/gen5/pokemon/0700-000-Sylveon.png
diff --git a/src/canonical/minisprites/gen5/custom/0701-000-Hawlucha.png b/src/noncanonical/minisprites/gen5/pokemon/0701-000-Hawlucha.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0701-000-Hawlucha.png
rename to src/noncanonical/minisprites/gen5/pokemon/0701-000-Hawlucha.png
diff --git a/src/canonical/minisprites/gen5/custom/0702-000-Dedenne.png b/src/noncanonical/minisprites/gen5/pokemon/0702-000-Dedenne.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0702-000-Dedenne.png
rename to src/noncanonical/minisprites/gen5/pokemon/0702-000-Dedenne.png
diff --git a/src/canonical/minisprites/gen5/custom/0703-000-Carbink.png b/src/noncanonical/minisprites/gen5/pokemon/0703-000-Carbink.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0703-000-Carbink.png
rename to src/noncanonical/minisprites/gen5/pokemon/0703-000-Carbink.png
diff --git a/src/canonical/minisprites/gen5/custom/0704-000-Goomy.png b/src/noncanonical/minisprites/gen5/pokemon/0704-000-Goomy.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0704-000-Goomy.png
rename to src/noncanonical/minisprites/gen5/pokemon/0704-000-Goomy.png
diff --git a/src/canonical/minisprites/gen5/custom/0705-000-Sliggoo.png b/src/noncanonical/minisprites/gen5/pokemon/0705-000-Sliggoo.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0705-000-Sliggoo.png
rename to src/noncanonical/minisprites/gen5/pokemon/0705-000-Sliggoo.png
diff --git a/src/canonical/minisprites/gen5/custom/0706-000-Goodra.png b/src/noncanonical/minisprites/gen5/pokemon/0706-000-Goodra.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0706-000-Goodra.png
rename to src/noncanonical/minisprites/gen5/pokemon/0706-000-Goodra.png
diff --git a/src/canonical/minisprites/gen5/custom/0707-000-Klefki.png b/src/noncanonical/minisprites/gen5/pokemon/0707-000-Klefki.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0707-000-Klefki.png
rename to src/noncanonical/minisprites/gen5/pokemon/0707-000-Klefki.png
diff --git a/src/canonical/minisprites/gen5/custom/0708-000-Phantump.png b/src/noncanonical/minisprites/gen5/pokemon/0708-000-Phantump.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0708-000-Phantump.png
rename to src/noncanonical/minisprites/gen5/pokemon/0708-000-Phantump.png
diff --git a/src/canonical/minisprites/gen5/custom/0709-000-Trevenant.png b/src/noncanonical/minisprites/gen5/pokemon/0709-000-Trevenant.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0709-000-Trevenant.png
rename to src/noncanonical/minisprites/gen5/pokemon/0709-000-Trevenant.png
diff --git a/src/canonical/minisprites/gen5/custom/0710-000-Pumpkaboo.png b/src/noncanonical/minisprites/gen5/pokemon/0710-000-Pumpkaboo.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0710-000-Pumpkaboo.png
rename to src/noncanonical/minisprites/gen5/pokemon/0710-000-Pumpkaboo.png
diff --git a/src/canonical/minisprites/gen5/custom/0711-000-Gourgeist.png b/src/noncanonical/minisprites/gen5/pokemon/0711-000-Gourgeist.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0711-000-Gourgeist.png
rename to src/noncanonical/minisprites/gen5/pokemon/0711-000-Gourgeist.png
diff --git a/src/canonical/minisprites/gen5/custom/0712-000-Bergmite.png b/src/noncanonical/minisprites/gen5/pokemon/0712-000-Bergmite.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0712-000-Bergmite.png
rename to src/noncanonical/minisprites/gen5/pokemon/0712-000-Bergmite.png
diff --git a/src/canonical/minisprites/gen5/custom/0713-000-Avalugg.png b/src/noncanonical/minisprites/gen5/pokemon/0713-000-Avalugg.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0713-000-Avalugg.png
rename to src/noncanonical/minisprites/gen5/pokemon/0713-000-Avalugg.png
diff --git a/src/canonical/minisprites/gen5/custom/0714-000-Noibat.png b/src/noncanonical/minisprites/gen5/pokemon/0714-000-Noibat.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0714-000-Noibat.png
rename to src/noncanonical/minisprites/gen5/pokemon/0714-000-Noibat.png
diff --git a/src/canonical/minisprites/gen5/custom/0715-000-Noivern.png b/src/noncanonical/minisprites/gen5/pokemon/0715-000-Noivern.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0715-000-Noivern.png
rename to src/noncanonical/minisprites/gen5/pokemon/0715-000-Noivern.png
diff --git a/src/canonical/minisprites/gen5/custom/0716-000-Xerneas.png b/src/noncanonical/minisprites/gen5/pokemon/0716-000-Xerneas.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0716-000-Xerneas.png
rename to src/noncanonical/minisprites/gen5/pokemon/0716-000-Xerneas.png
diff --git a/src/canonical/minisprites/gen5/custom/0717-000-Yveltal.png b/src/noncanonical/minisprites/gen5/pokemon/0717-000-Yveltal.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0717-000-Yveltal.png
rename to src/noncanonical/minisprites/gen5/pokemon/0717-000-Yveltal.png
diff --git a/src/canonical/minisprites/gen5/custom/0718-000-Zygarde.png b/src/noncanonical/minisprites/gen5/pokemon/0718-000-Zygarde.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0718-000-Zygarde.png
rename to src/noncanonical/minisprites/gen5/pokemon/0718-000-Zygarde.png
diff --git a/src/canonical/minisprites/gen5/custom/0719-000-Diancie.png b/src/noncanonical/minisprites/gen5/pokemon/0719-000-Diancie.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0719-000-Diancie.png
rename to src/noncanonical/minisprites/gen5/pokemon/0719-000-Diancie.png
diff --git a/src/canonical/minisprites/gen5/custom/0719-420-Diancie-Mega.png b/src/noncanonical/minisprites/gen5/pokemon/0719-420-Diancie-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0719-420-Diancie-Mega.png
rename to src/noncanonical/minisprites/gen5/pokemon/0719-420-Diancie-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0720-000-Hoopa.png b/src/noncanonical/minisprites/gen5/pokemon/0720-000-Hoopa.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0720-000-Hoopa.png
rename to src/noncanonical/minisprites/gen5/pokemon/0720-000-Hoopa.png
diff --git a/src/canonical/minisprites/gen5/custom/0720-420-Hoopa-Unbound.png b/src/noncanonical/minisprites/gen5/pokemon/0720-420-Hoopa-Unbound.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0720-420-Hoopa-Unbound.png
rename to src/noncanonical/minisprites/gen5/pokemon/0720-420-Hoopa-Unbound.png
diff --git a/src/canonical/minisprites/gen5/custom/0721-000-Volcanion.png b/src/noncanonical/minisprites/gen5/pokemon/0721-000-Volcanion.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0721-000-Volcanion.png
rename to src/noncanonical/minisprites/gen5/pokemon/0721-000-Volcanion.png
diff --git a/src/cap/minisprites/gen6/custom/README.md b/src/noncanonical/minisprites/gen6/asymmetrical/README.md
similarity index 100%
rename from src/cap/minisprites/gen6/custom/README.md
rename to src/noncanonical/minisprites/gen6/asymmetrical/README.md
diff --git a/src/noncanonical/minisprites/gen6/misc/README.md b/src/noncanonical/minisprites/gen6/misc/README.md
new file mode 100644
index 00000000..944c593a
--- /dev/null
+++ b/src/noncanonical/minisprites/gen6/misc/README.md
@@ -0,0 +1 @@
+Nothing to see here.
diff --git a/src/canonical/minisprites/gen6/custom/0006-420-Charizard-Gmax.png b/src/noncanonical/minisprites/gen6/pokemon/0006-420-Charizard-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0006-420-Charizard-Gmax.png
rename to src/noncanonical/minisprites/gen6/pokemon/0006-420-Charizard-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0012-420-Butterfree-Gmax.png b/src/noncanonical/minisprites/gen6/pokemon/0012-420-Butterfree-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0012-420-Butterfree-Gmax.png
rename to src/noncanonical/minisprites/gen6/pokemon/0012-420-Butterfree-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0025-420-Pikachu-Gmax.png b/src/noncanonical/minisprites/gen6/pokemon/0025-420-Pikachu-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0025-420-Pikachu-Gmax.png
rename to src/noncanonical/minisprites/gen6/pokemon/0025-420-Pikachu-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0052-420-Meowth-Galar.png b/src/noncanonical/minisprites/gen6/pokemon/0052-420-Meowth-Galar.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0052-420-Meowth-Galar.png
rename to src/noncanonical/minisprites/gen6/pokemon/0052-420-Meowth-Galar.png
diff --git a/src/canonical/minisprites/gen6/custom/0052-420-Meowth-Gmax.png b/src/noncanonical/minisprites/gen6/pokemon/0052-420-Meowth-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0052-420-Meowth-Gmax.png
rename to src/noncanonical/minisprites/gen6/pokemon/0052-420-Meowth-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0068-420-Machamp-Gmax.png b/src/noncanonical/minisprites/gen6/pokemon/0068-420-Machamp-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0068-420-Machamp-Gmax.png
rename to src/noncanonical/minisprites/gen6/pokemon/0068-420-Machamp-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0077-420-Ponyta-Galar.png b/src/noncanonical/minisprites/gen6/pokemon/0077-420-Ponyta-Galar.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0077-420-Ponyta-Galar.png
rename to src/noncanonical/minisprites/gen6/pokemon/0077-420-Ponyta-Galar.png
diff --git a/src/canonical/minisprites/gen6/custom/0078-420-Rapidash-Galar.png b/src/noncanonical/minisprites/gen6/pokemon/0078-420-Rapidash-Galar.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0078-420-Rapidash-Galar.png
rename to src/noncanonical/minisprites/gen6/pokemon/0078-420-Rapidash-Galar.png
diff --git a/src/canonical/minisprites/gen6/custom/0079-420-Slowpoke-Galar.png b/src/noncanonical/minisprites/gen6/pokemon/0079-420-Slowpoke-Galar.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0079-420-Slowpoke-Galar.png
rename to src/noncanonical/minisprites/gen6/pokemon/0079-420-Slowpoke-Galar.png
diff --git a/src/canonical/minisprites/gen6/custom/0083-420-Farfetch__0027d-Galar.png b/src/noncanonical/minisprites/gen6/pokemon/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/noncanonical/minisprites/gen6/pokemon/0083-420-Farfetch__0027d-Galar.png
diff --git a/src/canonical/minisprites/gen6/custom/0094-420-Gengar-Gmax.png b/src/noncanonical/minisprites/gen6/pokemon/0094-420-Gengar-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0094-420-Gengar-Gmax.png
rename to src/noncanonical/minisprites/gen6/pokemon/0094-420-Gengar-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0099-420-Kingler-Gmax.png b/src/noncanonical/minisprites/gen6/pokemon/0099-420-Kingler-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0099-420-Kingler-Gmax.png
rename to src/noncanonical/minisprites/gen6/pokemon/0099-420-Kingler-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0110-420-Weezing-Galar.png b/src/noncanonical/minisprites/gen6/pokemon/0110-420-Weezing-Galar.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0110-420-Weezing-Galar.png
rename to src/noncanonical/minisprites/gen6/pokemon/0110-420-Weezing-Galar.png
diff --git a/src/canonical/minisprites/gen6/custom/0122-420-Mr._Mime-Galar.png b/src/noncanonical/minisprites/gen6/pokemon/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/noncanonical/minisprites/gen6/pokemon/0122-420-Mr._Mime-Galar.png
diff --git a/src/canonical/minisprites/gen6/custom/0131-420-Lapras-Gmax.png b/src/noncanonical/minisprites/gen6/pokemon/0131-420-Lapras-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0131-420-Lapras-Gmax.png
rename to src/noncanonical/minisprites/gen6/pokemon/0131-420-Lapras-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0133-420-Eevee-Gmax.png b/src/noncanonical/minisprites/gen6/pokemon/0133-420-Eevee-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0133-420-Eevee-Gmax.png
rename to src/noncanonical/minisprites/gen6/pokemon/0133-420-Eevee-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0143-420-Snorlax-Gmax.png b/src/noncanonical/minisprites/gen6/pokemon/0143-420-Snorlax-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0143-420-Snorlax-Gmax.png
rename to src/noncanonical/minisprites/gen6/pokemon/0143-420-Snorlax-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0222-420-Corsola-Galar.png b/src/noncanonical/minisprites/gen6/pokemon/0222-420-Corsola-Galar.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0222-420-Corsola-Galar.png
rename to src/noncanonical/minisprites/gen6/pokemon/0222-420-Corsola-Galar.png
diff --git a/src/canonical/minisprites/gen6/custom/0263-420-Zigzagoon-Galar.png b/src/noncanonical/minisprites/gen6/pokemon/0263-420-Zigzagoon-Galar.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0263-420-Zigzagoon-Galar.png
rename to src/noncanonical/minisprites/gen6/pokemon/0263-420-Zigzagoon-Galar.png
diff --git a/src/canonical/minisprites/gen6/custom/0264-420-Linoone-Galar.png b/src/noncanonical/minisprites/gen6/pokemon/0264-420-Linoone-Galar.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0264-420-Linoone-Galar.png
rename to src/noncanonical/minisprites/gen6/pokemon/0264-420-Linoone-Galar.png
diff --git a/src/canonical/minisprites/gen6/custom/0554-420-Darumaka-Galar.png b/src/noncanonical/minisprites/gen6/pokemon/0554-420-Darumaka-Galar.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0554-420-Darumaka-Galar.png
rename to src/noncanonical/minisprites/gen6/pokemon/0554-420-Darumaka-Galar.png
diff --git a/src/canonical/minisprites/gen6/custom/0555-420-Darmanitan-Galar.png b/src/noncanonical/minisprites/gen6/pokemon/0555-420-Darmanitan-Galar.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0555-420-Darmanitan-Galar.png
rename to src/noncanonical/minisprites/gen6/pokemon/0555-420-Darmanitan-Galar.png
diff --git a/src/canonical/minisprites/gen6/custom/0555-420-Darmanitan-Galar~Zen.png b/src/noncanonical/minisprites/gen6/pokemon/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/noncanonical/minisprites/gen6/pokemon/0555-420-Darmanitan-Galar~Zen.png
diff --git a/src/canonical/minisprites/gen6/custom/0562-420-Yamask-Galar.png b/src/noncanonical/minisprites/gen6/pokemon/0562-420-Yamask-Galar.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0562-420-Yamask-Galar.png
rename to src/noncanonical/minisprites/gen6/pokemon/0562-420-Yamask-Galar.png
diff --git a/src/canonical/minisprites/gen6/custom/0569-420-Garbodor-Gmax.png b/src/noncanonical/minisprites/gen6/pokemon/0569-420-Garbodor-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0569-420-Garbodor-Gmax.png
rename to src/noncanonical/minisprites/gen6/pokemon/0569-420-Garbodor-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0618-420-Stunfisk-Galar.png b/src/noncanonical/minisprites/gen6/pokemon/0618-420-Stunfisk-Galar.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0618-420-Stunfisk-Galar.png
rename to src/noncanonical/minisprites/gen6/pokemon/0618-420-Stunfisk-Galar.png
diff --git a/src/canonical/minisprites/gen6/custom/0809-000-Melmetal.png b/src/noncanonical/minisprites/gen6/pokemon/0809-000-Melmetal.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0809-000-Melmetal.png
rename to src/noncanonical/minisprites/gen6/pokemon/0809-000-Melmetal.png
diff --git a/src/canonical/minisprites/gen6/custom/0809-420-Melmetal-Gmax.png b/src/noncanonical/minisprites/gen6/pokemon/0809-420-Melmetal-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0809-420-Melmetal-Gmax.png
rename to src/noncanonical/minisprites/gen6/pokemon/0809-420-Melmetal-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0810-000-Grookey.png b/src/noncanonical/minisprites/gen6/pokemon/0810-000-Grookey.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0810-000-Grookey.png
rename to src/noncanonical/minisprites/gen6/pokemon/0810-000-Grookey.png
diff --git a/src/canonical/minisprites/gen6/custom/0811-000-Thwackey.png b/src/noncanonical/minisprites/gen6/pokemon/0811-000-Thwackey.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0811-000-Thwackey.png
rename to src/noncanonical/minisprites/gen6/pokemon/0811-000-Thwackey.png
diff --git a/src/canonical/minisprites/gen6/custom/0812-000-Rillaboom.png b/src/noncanonical/minisprites/gen6/pokemon/0812-000-Rillaboom.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0812-000-Rillaboom.png
rename to src/noncanonical/minisprites/gen6/pokemon/0812-000-Rillaboom.png
diff --git a/src/canonical/minisprites/gen6/custom/0813-000-Scorbunny.png b/src/noncanonical/minisprites/gen6/pokemon/0813-000-Scorbunny.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0813-000-Scorbunny.png
rename to src/noncanonical/minisprites/gen6/pokemon/0813-000-Scorbunny.png
diff --git a/src/canonical/minisprites/gen6/custom/0814-000-Raboot.png b/src/noncanonical/minisprites/gen6/pokemon/0814-000-Raboot.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0814-000-Raboot.png
rename to src/noncanonical/minisprites/gen6/pokemon/0814-000-Raboot.png
diff --git a/src/canonical/minisprites/gen6/custom/0815-000-Cinderace.png b/src/noncanonical/minisprites/gen6/pokemon/0815-000-Cinderace.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0815-000-Cinderace.png
rename to src/noncanonical/minisprites/gen6/pokemon/0815-000-Cinderace.png
diff --git a/src/canonical/minisprites/gen6/custom/0816-000-Sobble.png b/src/noncanonical/minisprites/gen6/pokemon/0816-000-Sobble.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0816-000-Sobble.png
rename to src/noncanonical/minisprites/gen6/pokemon/0816-000-Sobble.png
diff --git a/src/canonical/minisprites/gen6/custom/0817-000-Drizzile.png b/src/noncanonical/minisprites/gen6/pokemon/0817-000-Drizzile.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0817-000-Drizzile.png
rename to src/noncanonical/minisprites/gen6/pokemon/0817-000-Drizzile.png
diff --git a/src/canonical/minisprites/gen6/custom/0818-000-Inteleon.png b/src/noncanonical/minisprites/gen6/pokemon/0818-000-Inteleon.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0818-000-Inteleon.png
rename to src/noncanonical/minisprites/gen6/pokemon/0818-000-Inteleon.png
diff --git a/src/canonical/minisprites/gen6/custom/0819-000-Skwovet.png b/src/noncanonical/minisprites/gen6/pokemon/0819-000-Skwovet.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0819-000-Skwovet.png
rename to src/noncanonical/minisprites/gen6/pokemon/0819-000-Skwovet.png
diff --git a/src/canonical/minisprites/gen6/custom/0820-000-Greedent.png b/src/noncanonical/minisprites/gen6/pokemon/0820-000-Greedent.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0820-000-Greedent.png
rename to src/noncanonical/minisprites/gen6/pokemon/0820-000-Greedent.png
diff --git a/src/canonical/minisprites/gen6/custom/0821-000-Rookidee.png b/src/noncanonical/minisprites/gen6/pokemon/0821-000-Rookidee.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0821-000-Rookidee.png
rename to src/noncanonical/minisprites/gen6/pokemon/0821-000-Rookidee.png
diff --git a/src/canonical/minisprites/gen6/custom/0822-000-Corvisquire.png b/src/noncanonical/minisprites/gen6/pokemon/0822-000-Corvisquire.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0822-000-Corvisquire.png
rename to src/noncanonical/minisprites/gen6/pokemon/0822-000-Corvisquire.png
diff --git a/src/canonical/minisprites/gen6/custom/0823-000-Corviknight.png b/src/noncanonical/minisprites/gen6/pokemon/0823-000-Corviknight.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0823-000-Corviknight.png
rename to src/noncanonical/minisprites/gen6/pokemon/0823-000-Corviknight.png
diff --git a/src/canonical/minisprites/gen6/custom/0823-420-Corviknight-Gmax.png b/src/noncanonical/minisprites/gen6/pokemon/0823-420-Corviknight-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0823-420-Corviknight-Gmax.png
rename to src/noncanonical/minisprites/gen6/pokemon/0823-420-Corviknight-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0824-000-Blipbug.png b/src/noncanonical/minisprites/gen6/pokemon/0824-000-Blipbug.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0824-000-Blipbug.png
rename to src/noncanonical/minisprites/gen6/pokemon/0824-000-Blipbug.png
diff --git a/src/canonical/minisprites/gen6/custom/0825-000-Dottler.png b/src/noncanonical/minisprites/gen6/pokemon/0825-000-Dottler.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0825-000-Dottler.png
rename to src/noncanonical/minisprites/gen6/pokemon/0825-000-Dottler.png
diff --git a/src/canonical/minisprites/gen6/custom/0826-000-Orbeetle.png b/src/noncanonical/minisprites/gen6/pokemon/0826-000-Orbeetle.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0826-000-Orbeetle.png
rename to src/noncanonical/minisprites/gen6/pokemon/0826-000-Orbeetle.png
diff --git a/src/canonical/minisprites/gen6/custom/0826-420-Orbeetle-Gmax.png b/src/noncanonical/minisprites/gen6/pokemon/0826-420-Orbeetle-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0826-420-Orbeetle-Gmax.png
rename to src/noncanonical/minisprites/gen6/pokemon/0826-420-Orbeetle-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0827-000-Nickit.png b/src/noncanonical/minisprites/gen6/pokemon/0827-000-Nickit.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0827-000-Nickit.png
rename to src/noncanonical/minisprites/gen6/pokemon/0827-000-Nickit.png
diff --git a/src/canonical/minisprites/gen6/custom/0828-000-Thievul.png b/src/noncanonical/minisprites/gen6/pokemon/0828-000-Thievul.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0828-000-Thievul.png
rename to src/noncanonical/minisprites/gen6/pokemon/0828-000-Thievul.png
diff --git a/src/canonical/minisprites/gen6/custom/0829-000-Gossifleur.png b/src/noncanonical/minisprites/gen6/pokemon/0829-000-Gossifleur.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0829-000-Gossifleur.png
rename to src/noncanonical/minisprites/gen6/pokemon/0829-000-Gossifleur.png
diff --git a/src/canonical/minisprites/gen6/custom/0830-000-Eldegoss.png b/src/noncanonical/minisprites/gen6/pokemon/0830-000-Eldegoss.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0830-000-Eldegoss.png
rename to src/noncanonical/minisprites/gen6/pokemon/0830-000-Eldegoss.png
diff --git a/src/canonical/minisprites/gen6/custom/0831-000-Wooloo.png b/src/noncanonical/minisprites/gen6/pokemon/0831-000-Wooloo.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0831-000-Wooloo.png
rename to src/noncanonical/minisprites/gen6/pokemon/0831-000-Wooloo.png
diff --git a/src/canonical/minisprites/gen6/custom/0832-000-Dubwool.png b/src/noncanonical/minisprites/gen6/pokemon/0832-000-Dubwool.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0832-000-Dubwool.png
rename to src/noncanonical/minisprites/gen6/pokemon/0832-000-Dubwool.png
diff --git a/src/canonical/minisprites/gen6/custom/0833-000-Chewtle.png b/src/noncanonical/minisprites/gen6/pokemon/0833-000-Chewtle.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0833-000-Chewtle.png
rename to src/noncanonical/minisprites/gen6/pokemon/0833-000-Chewtle.png
diff --git a/src/canonical/minisprites/gen6/custom/0834-000-Drednaw.png b/src/noncanonical/minisprites/gen6/pokemon/0834-000-Drednaw.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0834-000-Drednaw.png
rename to src/noncanonical/minisprites/gen6/pokemon/0834-000-Drednaw.png
diff --git a/src/canonical/minisprites/gen6/custom/0834-420-Drednaw-Gmax.png b/src/noncanonical/minisprites/gen6/pokemon/0834-420-Drednaw-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0834-420-Drednaw-Gmax.png
rename to src/noncanonical/minisprites/gen6/pokemon/0834-420-Drednaw-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0835-000-Yamper.png b/src/noncanonical/minisprites/gen6/pokemon/0835-000-Yamper.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0835-000-Yamper.png
rename to src/noncanonical/minisprites/gen6/pokemon/0835-000-Yamper.png
diff --git a/src/canonical/minisprites/gen6/custom/0836-000-Boltund.png b/src/noncanonical/minisprites/gen6/pokemon/0836-000-Boltund.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0836-000-Boltund.png
rename to src/noncanonical/minisprites/gen6/pokemon/0836-000-Boltund.png
diff --git a/src/canonical/minisprites/gen6/custom/0838-000-Carkol.png b/src/noncanonical/minisprites/gen6/pokemon/0838-000-Carkol.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0838-000-Carkol.png
rename to src/noncanonical/minisprites/gen6/pokemon/0838-000-Carkol.png
diff --git a/src/canonical/minisprites/gen6/custom/0839-000-Coalossal.png b/src/noncanonical/minisprites/gen6/pokemon/0839-000-Coalossal.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0839-000-Coalossal.png
rename to src/noncanonical/minisprites/gen6/pokemon/0839-000-Coalossal.png
diff --git a/src/canonical/minisprites/gen6/custom/0839-420-Coalossal-Gmax.png b/src/noncanonical/minisprites/gen6/pokemon/0839-420-Coalossal-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0839-420-Coalossal-Gmax.png
rename to src/noncanonical/minisprites/gen6/pokemon/0839-420-Coalossal-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0840-000-Applin.png b/src/noncanonical/minisprites/gen6/pokemon/0840-000-Applin.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0840-000-Applin.png
rename to src/noncanonical/minisprites/gen6/pokemon/0840-000-Applin.png
diff --git a/src/canonical/minisprites/gen6/custom/0841-000-Flapple.png b/src/noncanonical/minisprites/gen6/pokemon/0841-000-Flapple.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0841-000-Flapple.png
rename to src/noncanonical/minisprites/gen6/pokemon/0841-000-Flapple.png
diff --git a/src/canonical/minisprites/gen6/custom/0841-420-Flapple-Gmax.png b/src/noncanonical/minisprites/gen6/pokemon/0841-420-Flapple-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0841-420-Flapple-Gmax.png
rename to src/noncanonical/minisprites/gen6/pokemon/0841-420-Flapple-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0842-000-Appletun.png b/src/noncanonical/minisprites/gen6/pokemon/0842-000-Appletun.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0842-000-Appletun.png
rename to src/noncanonical/minisprites/gen6/pokemon/0842-000-Appletun.png
diff --git a/src/canonical/minisprites/gen6/custom/0842-420-Appletun-Gmax.png b/src/noncanonical/minisprites/gen6/pokemon/0842-420-Appletun-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0842-420-Appletun-Gmax.png
rename to src/noncanonical/minisprites/gen6/pokemon/0842-420-Appletun-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0843-000-Silicobra.png b/src/noncanonical/minisprites/gen6/pokemon/0843-000-Silicobra.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0843-000-Silicobra.png
rename to src/noncanonical/minisprites/gen6/pokemon/0843-000-Silicobra.png
diff --git a/src/canonical/minisprites/gen6/custom/0844-000-Sandaconda.png b/src/noncanonical/minisprites/gen6/pokemon/0844-000-Sandaconda.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0844-000-Sandaconda.png
rename to src/noncanonical/minisprites/gen6/pokemon/0844-000-Sandaconda.png
diff --git a/src/canonical/minisprites/gen6/custom/0844-420-Sandaconda-Gmax.png b/src/noncanonical/minisprites/gen6/pokemon/0844-420-Sandaconda-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0844-420-Sandaconda-Gmax.png
rename to src/noncanonical/minisprites/gen6/pokemon/0844-420-Sandaconda-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0845-000-Cramorant.png b/src/noncanonical/minisprites/gen6/pokemon/0845-000-Cramorant.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0845-000-Cramorant.png
rename to src/noncanonical/minisprites/gen6/pokemon/0845-000-Cramorant.png
diff --git a/src/canonical/minisprites/gen6/custom/0845-420-Cramorant-Gorging.png b/src/noncanonical/minisprites/gen6/pokemon/0845-420-Cramorant-Gorging.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0845-420-Cramorant-Gorging.png
rename to src/noncanonical/minisprites/gen6/pokemon/0845-420-Cramorant-Gorging.png
diff --git a/src/canonical/minisprites/gen6/custom/0845-420-Cramorant-Gulping.png b/src/noncanonical/minisprites/gen6/pokemon/0845-420-Cramorant-Gulping.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0845-420-Cramorant-Gulping.png
rename to src/noncanonical/minisprites/gen6/pokemon/0845-420-Cramorant-Gulping.png
diff --git a/src/canonical/minisprites/gen6/custom/0846-000-Arrokuda.png b/src/noncanonical/minisprites/gen6/pokemon/0846-000-Arrokuda.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0846-000-Arrokuda.png
rename to src/noncanonical/minisprites/gen6/pokemon/0846-000-Arrokuda.png
diff --git a/src/canonical/minisprites/gen6/custom/0847-000-Barraskewda.png b/src/noncanonical/minisprites/gen6/pokemon/0847-000-Barraskewda.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0847-000-Barraskewda.png
rename to src/noncanonical/minisprites/gen6/pokemon/0847-000-Barraskewda.png
diff --git a/src/canonical/minisprites/gen6/custom/0848-000-Toxel.png b/src/noncanonical/minisprites/gen6/pokemon/0848-000-Toxel.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0848-000-Toxel.png
rename to src/noncanonical/minisprites/gen6/pokemon/0848-000-Toxel.png
diff --git a/src/canonical/minisprites/gen6/custom/0849-000-Toxtricity.png b/src/noncanonical/minisprites/gen6/pokemon/0849-000-Toxtricity.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0849-000-Toxtricity.png
rename to src/noncanonical/minisprites/gen6/pokemon/0849-000-Toxtricity.png
diff --git a/src/canonical/minisprites/gen6/custom/0849-420-Toxtricity-Gmax.png b/src/noncanonical/minisprites/gen6/pokemon/0849-420-Toxtricity-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0849-420-Toxtricity-Gmax.png
rename to src/noncanonical/minisprites/gen6/pokemon/0849-420-Toxtricity-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0849-420-Toxtricity-Low~Key.png b/src/noncanonical/minisprites/gen6/pokemon/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/noncanonical/minisprites/gen6/pokemon/0849-420-Toxtricity-Low~Key.png
diff --git a/src/canonical/minisprites/gen6/custom/0850-000-Sizzlipede.png b/src/noncanonical/minisprites/gen6/pokemon/0850-000-Sizzlipede.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0850-000-Sizzlipede.png
rename to src/noncanonical/minisprites/gen6/pokemon/0850-000-Sizzlipede.png
diff --git a/src/canonical/minisprites/gen6/custom/0851-000-Centiskorch.png b/src/noncanonical/minisprites/gen6/pokemon/0851-000-Centiskorch.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0851-000-Centiskorch.png
rename to src/noncanonical/minisprites/gen6/pokemon/0851-000-Centiskorch.png
diff --git a/src/canonical/minisprites/gen6/custom/0851-420-Centiskorch-Gmax.png b/src/noncanonical/minisprites/gen6/pokemon/0851-420-Centiskorch-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0851-420-Centiskorch-Gmax.png
rename to src/noncanonical/minisprites/gen6/pokemon/0851-420-Centiskorch-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0852-000-Clobbopus.png b/src/noncanonical/minisprites/gen6/pokemon/0852-000-Clobbopus.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0852-000-Clobbopus.png
rename to src/noncanonical/minisprites/gen6/pokemon/0852-000-Clobbopus.png
diff --git a/src/canonical/minisprites/gen6/custom/0853-000-Grapploct.png b/src/noncanonical/minisprites/gen6/pokemon/0853-000-Grapploct.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0853-000-Grapploct.png
rename to src/noncanonical/minisprites/gen6/pokemon/0853-000-Grapploct.png
diff --git a/src/canonical/minisprites/gen6/custom/0854-000-Sinistea.png b/src/noncanonical/minisprites/gen6/pokemon/0854-000-Sinistea.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0854-000-Sinistea.png
rename to src/noncanonical/minisprites/gen6/pokemon/0854-000-Sinistea.png
diff --git a/src/canonical/minisprites/gen6/custom/0855-000-Polteageist.png b/src/noncanonical/minisprites/gen6/pokemon/0855-000-Polteageist.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0855-000-Polteageist.png
rename to src/noncanonical/minisprites/gen6/pokemon/0855-000-Polteageist.png
diff --git a/src/canonical/minisprites/gen6/custom/0856-000-Hatenna.png b/src/noncanonical/minisprites/gen6/pokemon/0856-000-Hatenna.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0856-000-Hatenna.png
rename to src/noncanonical/minisprites/gen6/pokemon/0856-000-Hatenna.png
diff --git a/src/canonical/minisprites/gen6/custom/0857-000-Hattrem.png b/src/noncanonical/minisprites/gen6/pokemon/0857-000-Hattrem.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0857-000-Hattrem.png
rename to src/noncanonical/minisprites/gen6/pokemon/0857-000-Hattrem.png
diff --git a/src/canonical/minisprites/gen6/custom/0858-000-Hatterene.png b/src/noncanonical/minisprites/gen6/pokemon/0858-000-Hatterene.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0858-000-Hatterene.png
rename to src/noncanonical/minisprites/gen6/pokemon/0858-000-Hatterene.png
diff --git a/src/canonical/minisprites/gen6/custom/0858-420-Hatterene-Gmax.png b/src/noncanonical/minisprites/gen6/pokemon/0858-420-Hatterene-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0858-420-Hatterene-Gmax.png
rename to src/noncanonical/minisprites/gen6/pokemon/0858-420-Hatterene-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0859-000-Impidimp.png b/src/noncanonical/minisprites/gen6/pokemon/0859-000-Impidimp.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0859-000-Impidimp.png
rename to src/noncanonical/minisprites/gen6/pokemon/0859-000-Impidimp.png
diff --git a/src/canonical/minisprites/gen6/custom/0860-000-Morgrem.png b/src/noncanonical/minisprites/gen6/pokemon/0860-000-Morgrem.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0860-000-Morgrem.png
rename to src/noncanonical/minisprites/gen6/pokemon/0860-000-Morgrem.png
diff --git a/src/canonical/minisprites/gen6/custom/0861-000-Grimmsnarl.png b/src/noncanonical/minisprites/gen6/pokemon/0861-000-Grimmsnarl.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0861-000-Grimmsnarl.png
rename to src/noncanonical/minisprites/gen6/pokemon/0861-000-Grimmsnarl.png
diff --git a/src/canonical/minisprites/gen6/custom/0861-420-Grimmsnarl-Gmax.png b/src/noncanonical/minisprites/gen6/pokemon/0861-420-Grimmsnarl-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0861-420-Grimmsnarl-Gmax.png
rename to src/noncanonical/minisprites/gen6/pokemon/0861-420-Grimmsnarl-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0862-000-Obstagoon.png b/src/noncanonical/minisprites/gen6/pokemon/0862-000-Obstagoon.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0862-000-Obstagoon.png
rename to src/noncanonical/minisprites/gen6/pokemon/0862-000-Obstagoon.png
diff --git a/src/canonical/minisprites/gen6/custom/0863-000-Perrserker.png b/src/noncanonical/minisprites/gen6/pokemon/0863-000-Perrserker.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0863-000-Perrserker.png
rename to src/noncanonical/minisprites/gen6/pokemon/0863-000-Perrserker.png
diff --git a/src/canonical/minisprites/gen6/custom/0864-000-Cursola.png b/src/noncanonical/minisprites/gen6/pokemon/0864-000-Cursola.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0864-000-Cursola.png
rename to src/noncanonical/minisprites/gen6/pokemon/0864-000-Cursola.png
diff --git a/src/canonical/minisprites/gen6/custom/0865-000-Sirfetch__0027d.png b/src/noncanonical/minisprites/gen6/pokemon/0865-000-Sirfetch__0027d.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0865-000-Sirfetch__0027d.png
rename to src/noncanonical/minisprites/gen6/pokemon/0865-000-Sirfetch__0027d.png
diff --git a/src/canonical/minisprites/gen6/custom/0866-000-Mr._Rime.png b/src/noncanonical/minisprites/gen6/pokemon/0866-000-Mr._Rime.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0866-000-Mr._Rime.png
rename to src/noncanonical/minisprites/gen6/pokemon/0866-000-Mr._Rime.png
diff --git a/src/canonical/minisprites/gen6/custom/0867-000-Runerigus.png b/src/noncanonical/minisprites/gen6/pokemon/0867-000-Runerigus.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0867-000-Runerigus.png
rename to src/noncanonical/minisprites/gen6/pokemon/0867-000-Runerigus.png
diff --git a/src/canonical/minisprites/gen6/custom/0868-000-Milcery.png b/src/noncanonical/minisprites/gen6/pokemon/0868-000-Milcery.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0868-000-Milcery.png
rename to src/noncanonical/minisprites/gen6/pokemon/0868-000-Milcery.png
diff --git a/src/canonical/minisprites/gen6/custom/0869-000-Alcremie.png b/src/noncanonical/minisprites/gen6/pokemon/0869-000-Alcremie.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0869-000-Alcremie.png
rename to src/noncanonical/minisprites/gen6/pokemon/0869-000-Alcremie.png
diff --git a/src/canonical/minisprites/gen6/custom/0869-420-Alcremie-Caramel_Swirl.png b/src/noncanonical/minisprites/gen6/pokemon/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/noncanonical/minisprites/gen6/pokemon/0869-420-Alcremie-Caramel_Swirl.png
diff --git a/src/canonical/minisprites/gen6/custom/0869-420-Alcremie-Gmax.png b/src/noncanonical/minisprites/gen6/pokemon/0869-420-Alcremie-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0869-420-Alcremie-Gmax.png
rename to src/noncanonical/minisprites/gen6/pokemon/0869-420-Alcremie-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0869-420-Alcremie-Lemon_Cream.png b/src/noncanonical/minisprites/gen6/pokemon/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/noncanonical/minisprites/gen6/pokemon/0869-420-Alcremie-Lemon_Cream.png
diff --git a/src/canonical/minisprites/gen6/custom/0869-420-Alcremie-Matcha_Cream.png b/src/noncanonical/minisprites/gen6/pokemon/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/noncanonical/minisprites/gen6/pokemon/0869-420-Alcremie-Matcha_Cream.png
diff --git a/src/canonical/minisprites/gen6/custom/0869-420-Alcremie-Mint_Cream.png b/src/noncanonical/minisprites/gen6/pokemon/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/noncanonical/minisprites/gen6/pokemon/0869-420-Alcremie-Mint_Cream.png
diff --git a/src/canonical/minisprites/gen6/custom/0869-420-Alcremie-Rainbow_Swirl.png b/src/noncanonical/minisprites/gen6/pokemon/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/noncanonical/minisprites/gen6/pokemon/0869-420-Alcremie-Rainbow_Swirl.png
diff --git a/src/canonical/minisprites/gen6/custom/0869-420-Alcremie-Ruby_Cream.png b/src/noncanonical/minisprites/gen6/pokemon/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/noncanonical/minisprites/gen6/pokemon/0869-420-Alcremie-Ruby_Cream.png
diff --git a/src/canonical/minisprites/gen6/custom/0869-420-Alcremie-Ruby_Swirl.png b/src/noncanonical/minisprites/gen6/pokemon/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/noncanonical/minisprites/gen6/pokemon/0869-420-Alcremie-Ruby_Swirl.png
diff --git a/src/canonical/minisprites/gen6/custom/0869-420-Alcremie-Salted_Cream.png b/src/noncanonical/minisprites/gen6/pokemon/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/noncanonical/minisprites/gen6/pokemon/0869-420-Alcremie-Salted_Cream.png
diff --git a/src/canonical/minisprites/gen6/custom/0870-000-Falinks.png b/src/noncanonical/minisprites/gen6/pokemon/0870-000-Falinks.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0870-000-Falinks.png
rename to src/noncanonical/minisprites/gen6/pokemon/0870-000-Falinks.png
diff --git a/src/canonical/minisprites/gen6/custom/0871-000-Pincurchin.png b/src/noncanonical/minisprites/gen6/pokemon/0871-000-Pincurchin.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0871-000-Pincurchin.png
rename to src/noncanonical/minisprites/gen6/pokemon/0871-000-Pincurchin.png
diff --git a/src/canonical/minisprites/gen6/custom/0872-000-Snom.png b/src/noncanonical/minisprites/gen6/pokemon/0872-000-Snom.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0872-000-Snom.png
rename to src/noncanonical/minisprites/gen6/pokemon/0872-000-Snom.png
diff --git a/src/canonical/minisprites/gen6/custom/0873-000-Frosmoth.png b/src/noncanonical/minisprites/gen6/pokemon/0873-000-Frosmoth.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0873-000-Frosmoth.png
rename to src/noncanonical/minisprites/gen6/pokemon/0873-000-Frosmoth.png
diff --git a/src/canonical/minisprites/gen6/custom/0874-000-Stonjourner.png b/src/noncanonical/minisprites/gen6/pokemon/0874-000-Stonjourner.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0874-000-Stonjourner.png
rename to src/noncanonical/minisprites/gen6/pokemon/0874-000-Stonjourner.png
diff --git a/src/canonical/minisprites/gen6/custom/0875-000-Eiscue.png b/src/noncanonical/minisprites/gen6/pokemon/0875-000-Eiscue.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0875-000-Eiscue.png
rename to src/noncanonical/minisprites/gen6/pokemon/0875-000-Eiscue.png
diff --git a/src/canonical/minisprites/gen6/custom/0875-420-Eiscue-Noice.png b/src/noncanonical/minisprites/gen6/pokemon/0875-420-Eiscue-Noice.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0875-420-Eiscue-Noice.png
rename to src/noncanonical/minisprites/gen6/pokemon/0875-420-Eiscue-Noice.png
diff --git a/src/canonical/minisprites/gen6/custom/0876-000-Indeedee.png b/src/noncanonical/minisprites/gen6/pokemon/0876-000-Indeedee.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0876-000-Indeedee.png
rename to src/noncanonical/minisprites/gen6/pokemon/0876-000-Indeedee.png
diff --git a/src/canonical/minisprites/gen6/custom/0876-420-Indeedee-F.png b/src/noncanonical/minisprites/gen6/pokemon/0876-420-Indeedee-F.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0876-420-Indeedee-F.png
rename to src/noncanonical/minisprites/gen6/pokemon/0876-420-Indeedee-F.png
diff --git a/src/canonical/minisprites/gen6/custom/0877-000-Morpeko.png b/src/noncanonical/minisprites/gen6/pokemon/0877-000-Morpeko.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0877-000-Morpeko.png
rename to src/noncanonical/minisprites/gen6/pokemon/0877-000-Morpeko.png
diff --git a/src/canonical/minisprites/gen6/custom/0877-420-Morpeko-Hangry.png b/src/noncanonical/minisprites/gen6/pokemon/0877-420-Morpeko-Hangry.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0877-420-Morpeko-Hangry.png
rename to src/noncanonical/minisprites/gen6/pokemon/0877-420-Morpeko-Hangry.png
diff --git a/src/canonical/minisprites/gen6/custom/0878-000-Cufant.png b/src/noncanonical/minisprites/gen6/pokemon/0878-000-Cufant.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0878-000-Cufant.png
rename to src/noncanonical/minisprites/gen6/pokemon/0878-000-Cufant.png
diff --git a/src/canonical/minisprites/gen6/custom/0879-000-Copperajah.png b/src/noncanonical/minisprites/gen6/pokemon/0879-000-Copperajah.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0879-000-Copperajah.png
rename to src/noncanonical/minisprites/gen6/pokemon/0879-000-Copperajah.png
diff --git a/src/canonical/minisprites/gen6/custom/0879-420-Copperajah-Gmax.png b/src/noncanonical/minisprites/gen6/pokemon/0879-420-Copperajah-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0879-420-Copperajah-Gmax.png
rename to src/noncanonical/minisprites/gen6/pokemon/0879-420-Copperajah-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0880-000-Dracozolt.png b/src/noncanonical/minisprites/gen6/pokemon/0880-000-Dracozolt.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0880-000-Dracozolt.png
rename to src/noncanonical/minisprites/gen6/pokemon/0880-000-Dracozolt.png
diff --git a/src/canonical/minisprites/gen6/custom/0881-000-Arctozolt.png b/src/noncanonical/minisprites/gen6/pokemon/0881-000-Arctozolt.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0881-000-Arctozolt.png
rename to src/noncanonical/minisprites/gen6/pokemon/0881-000-Arctozolt.png
diff --git a/src/canonical/minisprites/gen6/custom/0882-000-Dracovish.png b/src/noncanonical/minisprites/gen6/pokemon/0882-000-Dracovish.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0882-000-Dracovish.png
rename to src/noncanonical/minisprites/gen6/pokemon/0882-000-Dracovish.png
diff --git a/src/canonical/minisprites/gen6/custom/0883-000-Arctovish.png b/src/noncanonical/minisprites/gen6/pokemon/0883-000-Arctovish.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0883-000-Arctovish.png
rename to src/noncanonical/minisprites/gen6/pokemon/0883-000-Arctovish.png
diff --git a/src/canonical/minisprites/gen6/custom/0884-000-Duraludon.png b/src/noncanonical/minisprites/gen6/pokemon/0884-000-Duraludon.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0884-000-Duraludon.png
rename to src/noncanonical/minisprites/gen6/pokemon/0884-000-Duraludon.png
diff --git a/src/canonical/minisprites/gen6/custom/0884-420-Duraludon-Gmax.png b/src/noncanonical/minisprites/gen6/pokemon/0884-420-Duraludon-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0884-420-Duraludon-Gmax.png
rename to src/noncanonical/minisprites/gen6/pokemon/0884-420-Duraludon-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0885-000-Dreepy.png b/src/noncanonical/minisprites/gen6/pokemon/0885-000-Dreepy.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0885-000-Dreepy.png
rename to src/noncanonical/minisprites/gen6/pokemon/0885-000-Dreepy.png
diff --git a/src/canonical/minisprites/gen6/custom/0886-000-Drakloak.png b/src/noncanonical/minisprites/gen6/pokemon/0886-000-Drakloak.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0886-000-Drakloak.png
rename to src/noncanonical/minisprites/gen6/pokemon/0886-000-Drakloak.png
diff --git a/src/canonical/minisprites/gen6/custom/0887-000-Dragapult.png b/src/noncanonical/minisprites/gen6/pokemon/0887-000-Dragapult.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0887-000-Dragapult.png
rename to src/noncanonical/minisprites/gen6/pokemon/0887-000-Dragapult.png
diff --git a/src/canonical/minisprites/gen6/custom/0888-000-Zacian.png b/src/noncanonical/minisprites/gen6/pokemon/0888-000-Zacian.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0888-000-Zacian.png
rename to src/noncanonical/minisprites/gen6/pokemon/0888-000-Zacian.png
diff --git a/src/canonical/minisprites/gen6/custom/0888-420-Zacian-Crowned.png b/src/noncanonical/minisprites/gen6/pokemon/0888-420-Zacian-Crowned.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0888-420-Zacian-Crowned.png
rename to src/noncanonical/minisprites/gen6/pokemon/0888-420-Zacian-Crowned.png
diff --git a/src/canonical/minisprites/gen6/custom/0889-000-Zamazenta.png b/src/noncanonical/minisprites/gen6/pokemon/0889-000-Zamazenta.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0889-000-Zamazenta.png
rename to src/noncanonical/minisprites/gen6/pokemon/0889-000-Zamazenta.png
diff --git a/src/canonical/minisprites/gen6/custom/0889-420-Zamazenta-Crowned.png b/src/noncanonical/minisprites/gen6/pokemon/0889-420-Zamazenta-Crowned.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0889-420-Zamazenta-Crowned.png
rename to src/noncanonical/minisprites/gen6/pokemon/0889-420-Zamazenta-Crowned.png
diff --git a/src/canonical/minisprites/gen6/custom/0890-000-Eternatus.png b/src/noncanonical/minisprites/gen6/pokemon/0890-000-Eternatus.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0890-000-Eternatus.png
rename to src/noncanonical/minisprites/gen6/pokemon/0890-000-Eternatus.png
diff --git a/src/canonical/minisprites/gen6/custom/0890-420-Eternatus-Eternamax.png b/src/noncanonical/minisprites/gen6/pokemon/0890-420-Eternatus-Eternamax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0890-420-Eternatus-Eternamax.png
rename to src/noncanonical/minisprites/gen6/pokemon/0890-420-Eternatus-Eternamax.png