diff --git a/src/noncanonical/sprites/afd/back-shiny/Farfetch_0027d--Galar.png b/src/noncanonical/sprites/afd/back-shiny/Farfetch__0027d--Galar.png
similarity index 100%
rename from src/noncanonical/sprites/afd/back-shiny/Farfetch_0027d--Galar.png
rename to src/noncanonical/sprites/afd/back-shiny/Farfetch__0027d--Galar.png
diff --git a/src/noncanonical/sprites/afd/back-shiny/Farfetch_0027d.png b/src/noncanonical/sprites/afd/back-shiny/Farfetch__0027d.png
similarity index 100%
rename from src/noncanonical/sprites/afd/back-shiny/Farfetch_0027d.png
rename to src/noncanonical/sprites/afd/back-shiny/Farfetch__0027d.png
diff --git a/src/noncanonical/sprites/afd/back-shiny/Flabe_0301be_0301.png b/src/noncanonical/sprites/afd/back-shiny/Flabe__0301be__0301.png
similarity index 100%
rename from src/noncanonical/sprites/afd/back-shiny/Flabe_0301be_0301.png
rename to src/noncanonical/sprites/afd/back-shiny/Flabe__0301be__0301.png
diff --git a/src/noncanonical/sprites/afd/back-shiny/Mime_0020Jr..png b/src/noncanonical/sprites/afd/back-shiny/Mime_Jr..png
similarity index 100%
rename from src/noncanonical/sprites/afd/back-shiny/Mime_0020Jr..png
rename to src/noncanonical/sprites/afd/back-shiny/Mime_Jr..png
diff --git a/src/noncanonical/sprites/afd/back-shiny/Mr._0020Mime--Galar.png b/src/noncanonical/sprites/afd/back-shiny/Mr._Mime--Galar.png
similarity index 100%
rename from src/noncanonical/sprites/afd/back-shiny/Mr._0020Mime--Galar.png
rename to src/noncanonical/sprites/afd/back-shiny/Mr._Mime--Galar.png
diff --git a/src/noncanonical/sprites/afd/back-shiny/Mr._0020Mime.png b/src/noncanonical/sprites/afd/back-shiny/Mr._Mime.png
similarity index 100%
rename from src/noncanonical/sprites/afd/back-shiny/Mr._0020Mime.png
rename to src/noncanonical/sprites/afd/back-shiny/Mr._Mime.png
diff --git a/src/noncanonical/sprites/afd/back-shiny/Mr._0020Rime.png b/src/noncanonical/sprites/afd/back-shiny/Mr._Rime.png
similarity index 100%
rename from src/noncanonical/sprites/afd/back-shiny/Mr._0020Rime.png
rename to src/noncanonical/sprites/afd/back-shiny/Mr._Rime.png
diff --git a/src/noncanonical/sprites/afd/back-shiny/Oricorio--Pa_0027u.png b/src/noncanonical/sprites/afd/back-shiny/Oricorio--Pa__0027u.png
similarity index 100%
rename from src/noncanonical/sprites/afd/back-shiny/Oricorio--Pa_0027u.png
rename to src/noncanonical/sprites/afd/back-shiny/Oricorio--Pa__0027u.png
diff --git a/src/noncanonical/sprites/afd/back-shiny/Sirfetch_0027d.png b/src/noncanonical/sprites/afd/back-shiny/Sirfetch__0027d.png
similarity index 100%
rename from src/noncanonical/sprites/afd/back-shiny/Sirfetch_0027d.png
rename to src/noncanonical/sprites/afd/back-shiny/Sirfetch__0027d.png
diff --git a/src/noncanonical/sprites/afd/back-shiny/Tapu_0020Bulu.png b/src/noncanonical/sprites/afd/back-shiny/Tapu_Bulu.png
similarity index 100%
rename from src/noncanonical/sprites/afd/back-shiny/Tapu_0020Bulu.png
rename to src/noncanonical/sprites/afd/back-shiny/Tapu_Bulu.png
diff --git a/src/noncanonical/sprites/afd/back-shiny/Tapu_0020Fini.png b/src/noncanonical/sprites/afd/back-shiny/Tapu_Fini.png
similarity index 100%
rename from src/noncanonical/sprites/afd/back-shiny/Tapu_0020Fini.png
rename to src/noncanonical/sprites/afd/back-shiny/Tapu_Fini.png
diff --git a/src/noncanonical/sprites/afd/back-shiny/Tapu_0020Koko.png b/src/noncanonical/sprites/afd/back-shiny/Tapu_Koko.png
similarity index 100%
rename from src/noncanonical/sprites/afd/back-shiny/Tapu_0020Koko.png
rename to src/noncanonical/sprites/afd/back-shiny/Tapu_Koko.png
diff --git a/src/noncanonical/sprites/afd/back-shiny/Tapu_0020Lele.png b/src/noncanonical/sprites/afd/back-shiny/Tapu_Lele.png
similarity index 100%
rename from src/noncanonical/sprites/afd/back-shiny/Tapu_0020Lele.png
rename to src/noncanonical/sprites/afd/back-shiny/Tapu_Lele.png
diff --git a/src/noncanonical/sprites/afd/back-shiny/Type_003a_0020Null.png b/src/noncanonical/sprites/afd/back-shiny/Type__003a_Null.png
similarity index 100%
rename from src/noncanonical/sprites/afd/back-shiny/Type_003a_0020Null.png
rename to src/noncanonical/sprites/afd/back-shiny/Type__003a_Null.png
diff --git a/src/noncanonical/sprites/afd/back-shiny/Zygarde--10_0025.png b/src/noncanonical/sprites/afd/back-shiny/Zygarde--10__0025.png
similarity index 100%
rename from src/noncanonical/sprites/afd/back-shiny/Zygarde--10_0025.png
rename to src/noncanonical/sprites/afd/back-shiny/Zygarde--10__0025.png
diff --git a/src/noncanonical/sprites/afd/back/Farfetch_0027d--Galar.png b/src/noncanonical/sprites/afd/back/Farfetch__0027d--Galar.png
similarity index 100%
rename from src/noncanonical/sprites/afd/back/Farfetch_0027d--Galar.png
rename to src/noncanonical/sprites/afd/back/Farfetch__0027d--Galar.png
diff --git a/src/noncanonical/sprites/afd/back/Farfetch_0027d.png b/src/noncanonical/sprites/afd/back/Farfetch__0027d.png
similarity index 100%
rename from src/noncanonical/sprites/afd/back/Farfetch_0027d.png
rename to src/noncanonical/sprites/afd/back/Farfetch__0027d.png
diff --git a/src/noncanonical/sprites/afd/back/Flabe_0301be_0301.png b/src/noncanonical/sprites/afd/back/Flabe__0301be__0301.png
similarity index 100%
rename from src/noncanonical/sprites/afd/back/Flabe_0301be_0301.png
rename to src/noncanonical/sprites/afd/back/Flabe__0301be__0301.png
diff --git a/src/noncanonical/sprites/afd/back/Mime_0020Jr..png b/src/noncanonical/sprites/afd/back/Mime_Jr..png
similarity index 100%
rename from src/noncanonical/sprites/afd/back/Mime_0020Jr..png
rename to src/noncanonical/sprites/afd/back/Mime_Jr..png
diff --git a/src/noncanonical/sprites/afd/back/Mr._0020Mime--Galar.png b/src/noncanonical/sprites/afd/back/Mr._Mime--Galar.png
similarity index 100%
rename from src/noncanonical/sprites/afd/back/Mr._0020Mime--Galar.png
rename to src/noncanonical/sprites/afd/back/Mr._Mime--Galar.png
diff --git a/src/noncanonical/sprites/afd/back/Mr._0020Mime.png b/src/noncanonical/sprites/afd/back/Mr._Mime.png
similarity index 100%
rename from src/noncanonical/sprites/afd/back/Mr._0020Mime.png
rename to src/noncanonical/sprites/afd/back/Mr._Mime.png
diff --git a/src/noncanonical/sprites/afd/back/Mr._0020Rime.png b/src/noncanonical/sprites/afd/back/Mr._Rime.png
similarity index 100%
rename from src/noncanonical/sprites/afd/back/Mr._0020Rime.png
rename to src/noncanonical/sprites/afd/back/Mr._Rime.png
diff --git a/src/noncanonical/sprites/afd/back/Oricorio--Pa_0027u.png b/src/noncanonical/sprites/afd/back/Oricorio--Pa__0027u.png
similarity index 100%
rename from src/noncanonical/sprites/afd/back/Oricorio--Pa_0027u.png
rename to src/noncanonical/sprites/afd/back/Oricorio--Pa__0027u.png
diff --git a/src/noncanonical/sprites/afd/back/Sirfetch_0027d.png b/src/noncanonical/sprites/afd/back/Sirfetch__0027d.png
similarity index 100%
rename from src/noncanonical/sprites/afd/back/Sirfetch_0027d.png
rename to src/noncanonical/sprites/afd/back/Sirfetch__0027d.png
diff --git a/src/noncanonical/sprites/afd/back/Tapu_0020Bulu.png b/src/noncanonical/sprites/afd/back/Tapu_Bulu.png
similarity index 100%
rename from src/noncanonical/sprites/afd/back/Tapu_0020Bulu.png
rename to src/noncanonical/sprites/afd/back/Tapu_Bulu.png
diff --git a/src/noncanonical/sprites/afd/back/Tapu_0020Fini.png b/src/noncanonical/sprites/afd/back/Tapu_Fini.png
similarity index 100%
rename from src/noncanonical/sprites/afd/back/Tapu_0020Fini.png
rename to src/noncanonical/sprites/afd/back/Tapu_Fini.png
diff --git a/src/noncanonical/sprites/afd/back/Tapu_0020Koko.png b/src/noncanonical/sprites/afd/back/Tapu_Koko.png
similarity index 100%
rename from src/noncanonical/sprites/afd/back/Tapu_0020Koko.png
rename to src/noncanonical/sprites/afd/back/Tapu_Koko.png
diff --git a/src/noncanonical/sprites/afd/back/Tapu_0020Lele.png b/src/noncanonical/sprites/afd/back/Tapu_Lele.png
similarity index 100%
rename from src/noncanonical/sprites/afd/back/Tapu_0020Lele.png
rename to src/noncanonical/sprites/afd/back/Tapu_Lele.png
diff --git a/src/noncanonical/sprites/afd/back/Type_003a_0020Null.png b/src/noncanonical/sprites/afd/back/Type__003a_Null.png
similarity index 100%
rename from src/noncanonical/sprites/afd/back/Type_003a_0020Null.png
rename to src/noncanonical/sprites/afd/back/Type__003a_Null.png
diff --git a/src/noncanonical/sprites/afd/back/Zygarde--10_0025.png b/src/noncanonical/sprites/afd/back/Zygarde--10__0025.png
similarity index 100%
rename from src/noncanonical/sprites/afd/back/Zygarde--10_0025.png
rename to src/noncanonical/sprites/afd/back/Zygarde--10__0025.png
diff --git a/src/noncanonical/sprites/afd/front-shiny/Farfetch_0027d--Galar.png b/src/noncanonical/sprites/afd/front-shiny/Farfetch__0027d--Galar.png
similarity index 100%
rename from src/noncanonical/sprites/afd/front-shiny/Farfetch_0027d--Galar.png
rename to src/noncanonical/sprites/afd/front-shiny/Farfetch__0027d--Galar.png
diff --git a/src/noncanonical/sprites/afd/front-shiny/Farfetch_0027d.png b/src/noncanonical/sprites/afd/front-shiny/Farfetch__0027d.png
similarity index 100%
rename from src/noncanonical/sprites/afd/front-shiny/Farfetch_0027d.png
rename to src/noncanonical/sprites/afd/front-shiny/Farfetch__0027d.png
diff --git a/src/noncanonical/sprites/afd/front-shiny/Flabe_0301be_0301.png b/src/noncanonical/sprites/afd/front-shiny/Flabe__0301be__0301.png
similarity index 100%
rename from src/noncanonical/sprites/afd/front-shiny/Flabe_0301be_0301.png
rename to src/noncanonical/sprites/afd/front-shiny/Flabe__0301be__0301.png
diff --git a/src/noncanonical/sprites/afd/front-shiny/Mime_0020Jr..png b/src/noncanonical/sprites/afd/front-shiny/Mime_Jr..png
similarity index 100%
rename from src/noncanonical/sprites/afd/front-shiny/Mime_0020Jr..png
rename to src/noncanonical/sprites/afd/front-shiny/Mime_Jr..png
diff --git a/src/noncanonical/sprites/afd/front-shiny/Mr._0020Mime--Galar.png b/src/noncanonical/sprites/afd/front-shiny/Mr._Mime--Galar.png
similarity index 100%
rename from src/noncanonical/sprites/afd/front-shiny/Mr._0020Mime--Galar.png
rename to src/noncanonical/sprites/afd/front-shiny/Mr._Mime--Galar.png
diff --git a/src/noncanonical/sprites/afd/front-shiny/Mr._0020Mime.png b/src/noncanonical/sprites/afd/front-shiny/Mr._Mime.png
similarity index 100%
rename from src/noncanonical/sprites/afd/front-shiny/Mr._0020Mime.png
rename to src/noncanonical/sprites/afd/front-shiny/Mr._Mime.png
diff --git a/src/noncanonical/sprites/afd/front-shiny/Mr._0020Rime.png b/src/noncanonical/sprites/afd/front-shiny/Mr._Rime.png
similarity index 100%
rename from src/noncanonical/sprites/afd/front-shiny/Mr._0020Rime.png
rename to src/noncanonical/sprites/afd/front-shiny/Mr._Rime.png
diff --git a/src/noncanonical/sprites/afd/front-shiny/Oricorio--Pa_0027u.png b/src/noncanonical/sprites/afd/front-shiny/Oricorio--Pa__0027u.png
similarity index 100%
rename from src/noncanonical/sprites/afd/front-shiny/Oricorio--Pa_0027u.png
rename to src/noncanonical/sprites/afd/front-shiny/Oricorio--Pa__0027u.png
diff --git a/src/noncanonical/sprites/afd/front-shiny/Sirfetch_0027d.png b/src/noncanonical/sprites/afd/front-shiny/Sirfetch__0027d.png
similarity index 100%
rename from src/noncanonical/sprites/afd/front-shiny/Sirfetch_0027d.png
rename to src/noncanonical/sprites/afd/front-shiny/Sirfetch__0027d.png
diff --git a/src/noncanonical/sprites/afd/front-shiny/Tapu_0020Bulu.png b/src/noncanonical/sprites/afd/front-shiny/Tapu_Bulu.png
similarity index 100%
rename from src/noncanonical/sprites/afd/front-shiny/Tapu_0020Bulu.png
rename to src/noncanonical/sprites/afd/front-shiny/Tapu_Bulu.png
diff --git a/src/noncanonical/sprites/afd/front-shiny/Tapu_0020Fini.png b/src/noncanonical/sprites/afd/front-shiny/Tapu_Fini.png
similarity index 100%
rename from src/noncanonical/sprites/afd/front-shiny/Tapu_0020Fini.png
rename to src/noncanonical/sprites/afd/front-shiny/Tapu_Fini.png
diff --git a/src/noncanonical/sprites/afd/front-shiny/Tapu_0020Koko.png b/src/noncanonical/sprites/afd/front-shiny/Tapu_Koko.png
similarity index 100%
rename from src/noncanonical/sprites/afd/front-shiny/Tapu_0020Koko.png
rename to src/noncanonical/sprites/afd/front-shiny/Tapu_Koko.png
diff --git a/src/noncanonical/sprites/afd/front-shiny/Tapu_0020Lele.png b/src/noncanonical/sprites/afd/front-shiny/Tapu_Lele.png
similarity index 100%
rename from src/noncanonical/sprites/afd/front-shiny/Tapu_0020Lele.png
rename to src/noncanonical/sprites/afd/front-shiny/Tapu_Lele.png
diff --git a/src/noncanonical/sprites/afd/front-shiny/Type_003a_0020Null.png b/src/noncanonical/sprites/afd/front-shiny/Type__003a_Null.png
similarity index 100%
rename from src/noncanonical/sprites/afd/front-shiny/Type_003a_0020Null.png
rename to src/noncanonical/sprites/afd/front-shiny/Type__003a_Null.png
diff --git a/src/noncanonical/sprites/afd/front-shiny/Zygarde--10_0025.png b/src/noncanonical/sprites/afd/front-shiny/Zygarde--10__0025.png
similarity index 100%
rename from src/noncanonical/sprites/afd/front-shiny/Zygarde--10_0025.png
rename to src/noncanonical/sprites/afd/front-shiny/Zygarde--10__0025.png
diff --git a/src/noncanonical/sprites/afd/front/Farfetch_0027d--Galar.png b/src/noncanonical/sprites/afd/front/Farfetch__0027d--Galar.png
similarity index 100%
rename from src/noncanonical/sprites/afd/front/Farfetch_0027d--Galar.png
rename to src/noncanonical/sprites/afd/front/Farfetch__0027d--Galar.png
diff --git a/src/noncanonical/sprites/afd/front/Farfetch_0027d.png b/src/noncanonical/sprites/afd/front/Farfetch__0027d.png
similarity index 100%
rename from src/noncanonical/sprites/afd/front/Farfetch_0027d.png
rename to src/noncanonical/sprites/afd/front/Farfetch__0027d.png
diff --git a/src/noncanonical/sprites/afd/front/Flabe_0301be_0301.png b/src/noncanonical/sprites/afd/front/Flabe__0301be__0301.png
similarity index 100%
rename from src/noncanonical/sprites/afd/front/Flabe_0301be_0301.png
rename to src/noncanonical/sprites/afd/front/Flabe__0301be__0301.png
diff --git a/src/noncanonical/sprites/afd/front/Mime_0020Jr..png b/src/noncanonical/sprites/afd/front/Mime_Jr..png
similarity index 100%
rename from src/noncanonical/sprites/afd/front/Mime_0020Jr..png
rename to src/noncanonical/sprites/afd/front/Mime_Jr..png
diff --git a/src/noncanonical/sprites/afd/front/Mr._0020Mime--Galar.png b/src/noncanonical/sprites/afd/front/Mr._Mime--Galar.png
similarity index 100%
rename from src/noncanonical/sprites/afd/front/Mr._0020Mime--Galar.png
rename to src/noncanonical/sprites/afd/front/Mr._Mime--Galar.png
diff --git a/src/noncanonical/sprites/afd/front/Mr._0020Mime.png b/src/noncanonical/sprites/afd/front/Mr._Mime.png
similarity index 100%
rename from src/noncanonical/sprites/afd/front/Mr._0020Mime.png
rename to src/noncanonical/sprites/afd/front/Mr._Mime.png
diff --git a/src/noncanonical/sprites/afd/front/Mr._0020Rime.png b/src/noncanonical/sprites/afd/front/Mr._Rime.png
similarity index 100%
rename from src/noncanonical/sprites/afd/front/Mr._0020Rime.png
rename to src/noncanonical/sprites/afd/front/Mr._Rime.png
diff --git a/src/noncanonical/sprites/afd/front/Oricorio--Pa_0027u.png b/src/noncanonical/sprites/afd/front/Oricorio--Pa__0027u.png
similarity index 100%
rename from src/noncanonical/sprites/afd/front/Oricorio--Pa_0027u.png
rename to src/noncanonical/sprites/afd/front/Oricorio--Pa__0027u.png
diff --git a/src/noncanonical/sprites/afd/front/Sirfetch_0027d.png b/src/noncanonical/sprites/afd/front/Sirfetch__0027d.png
similarity index 100%
rename from src/noncanonical/sprites/afd/front/Sirfetch_0027d.png
rename to src/noncanonical/sprites/afd/front/Sirfetch__0027d.png
diff --git a/src/noncanonical/sprites/afd/front/Tapu_0020Bulu.png b/src/noncanonical/sprites/afd/front/Tapu_Bulu.png
similarity index 100%
rename from src/noncanonical/sprites/afd/front/Tapu_0020Bulu.png
rename to src/noncanonical/sprites/afd/front/Tapu_Bulu.png
diff --git a/src/noncanonical/sprites/afd/front/Tapu_0020Fini.png b/src/noncanonical/sprites/afd/front/Tapu_Fini.png
similarity index 100%
rename from src/noncanonical/sprites/afd/front/Tapu_0020Fini.png
rename to src/noncanonical/sprites/afd/front/Tapu_Fini.png
diff --git a/src/noncanonical/sprites/afd/front/Tapu_0020Koko.png b/src/noncanonical/sprites/afd/front/Tapu_Koko.png
similarity index 100%
rename from src/noncanonical/sprites/afd/front/Tapu_0020Koko.png
rename to src/noncanonical/sprites/afd/front/Tapu_Koko.png
diff --git a/src/noncanonical/sprites/afd/front/Tapu_0020Lele.png b/src/noncanonical/sprites/afd/front/Tapu_Lele.png
similarity index 100%
rename from src/noncanonical/sprites/afd/front/Tapu_0020Lele.png
rename to src/noncanonical/sprites/afd/front/Tapu_Lele.png
diff --git a/src/noncanonical/sprites/afd/front/Type_003a_0020Null.png b/src/noncanonical/sprites/afd/front/Type__003a_Null.png
similarity index 100%
rename from src/noncanonical/sprites/afd/front/Type_003a_0020Null.png
rename to src/noncanonical/sprites/afd/front/Type__003a_Null.png
diff --git a/src/noncanonical/sprites/afd/front/Zygarde--10_0025.png b/src/noncanonical/sprites/afd/front/Zygarde--10__0025.png
similarity index 100%
rename from src/noncanonical/sprites/afd/front/Zygarde--10_0025.png
rename to src/noncanonical/sprites/afd/front/Zygarde--10__0025.png