diff --git a/src/canonical/dex/front-cosmetic/Kerfluffle--Female.png b/src/cap/dex/front-cosmetic/Kerfluffle--Female.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/Kerfluffle--Female.png
rename to src/cap/dex/front-cosmetic/Kerfluffle--Female.png
diff --git a/src/cap/dex/front-cosmetic/Kitsunoh--Female.png b/src/cap/dex/front-cosmetic/Kitsunoh--Female.png
new file mode 100644
index 00000000..61536231
Binary files /dev/null and b/src/cap/dex/front-cosmetic/Kitsunoh--Female.png differ
diff --git a/src/cap/dex/front-cosmetic/Pyroak--Female.png b/src/cap/dex/front-cosmetic/Pyroak--Female.png
new file mode 100644
index 00000000..346b0897
Binary files /dev/null and b/src/cap/dex/front-cosmetic/Pyroak--Female.png differ
diff --git a/src/canonical/dex/front-shiny-cosmetic/Kerfluffle--Female.png b/src/cap/dex/front-shiny-cosmetic/Kerfluffle--Female.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/Kerfluffle--Female.png
rename to src/cap/dex/front-shiny-cosmetic/Kerfluffle--Female.png
diff --git a/src/cap/dex/front-shiny-cosmetic/Kitsunoh--Female.png b/src/cap/dex/front-shiny-cosmetic/Kitsunoh--Female.png
new file mode 100644
index 00000000..34e1a9e9
Binary files /dev/null and b/src/cap/dex/front-shiny-cosmetic/Kitsunoh--Female.png differ
diff --git a/src/cap/dex/front-shiny-cosmetic/Pyroak--Female.png b/src/cap/dex/front-shiny-cosmetic/Pyroak--Female.png
new file mode 100644
index 00000000..c6f3b28c
Binary files /dev/null and b/src/cap/dex/front-shiny-cosmetic/Pyroak--Female.png differ
diff --git a/src/canonical/dex/front-shiny/Caribolt.png b/src/cap/dex/front-shiny/Caribolt.png
similarity index 100%
rename from src/canonical/dex/front-shiny/Caribolt.png
rename to src/cap/dex/front-shiny/Caribolt.png
diff --git a/src/canonical/dex/front-shiny/Crucibelle--Mega.png b/src/cap/dex/front-shiny/Crucibelle--Mega.png
similarity index 100%
rename from src/canonical/dex/front-shiny/Crucibelle--Mega.png
rename to src/cap/dex/front-shiny/Crucibelle--Mega.png
diff --git a/src/canonical/dex/front-shiny/Crucibelle.png b/src/cap/dex/front-shiny/Crucibelle.png
similarity index 100%
rename from src/canonical/dex/front-shiny/Crucibelle.png
rename to src/cap/dex/front-shiny/Crucibelle.png
diff --git a/src/canonical/dex/front-shiny/Equilibra.png b/src/cap/dex/front-shiny/Equilibra.png
similarity index 100%
rename from src/canonical/dex/front-shiny/Equilibra.png
rename to src/cap/dex/front-shiny/Equilibra.png
diff --git a/src/canonical/dex/front-shiny/Fidgit.png b/src/cap/dex/front-shiny/Fidgit.png
similarity index 100%
rename from src/canonical/dex/front-shiny/Fidgit.png
rename to src/cap/dex/front-shiny/Fidgit.png
diff --git a/src/canonical/dex/front-shiny/Jumbao.png b/src/cap/dex/front-shiny/Jumbao.png
similarity index 100%
rename from src/canonical/dex/front-shiny/Jumbao.png
rename to src/cap/dex/front-shiny/Jumbao.png
diff --git a/src/canonical/dex/front-shiny/Kerfluffle.png b/src/cap/dex/front-shiny/Kerfluffle.png
similarity index 100%
rename from src/canonical/dex/front-shiny/Kerfluffle.png
rename to src/cap/dex/front-shiny/Kerfluffle.png
diff --git a/src/cap/dex/front-shiny/Kitsunoh.png b/src/cap/dex/front-shiny/Kitsunoh.png
new file mode 100644
index 00000000..f74ae7f0
Binary files /dev/null and b/src/cap/dex/front-shiny/Kitsunoh.png differ
diff --git a/src/canonical/dex/front-shiny/Mollux.png b/src/cap/dex/front-shiny/Mollux.png
similarity index 100%
rename from src/canonical/dex/front-shiny/Mollux.png
rename to src/cap/dex/front-shiny/Mollux.png
diff --git a/src/canonical/dex/front-shiny/Pajantom.png b/src/cap/dex/front-shiny/Pajantom.png
similarity index 100%
rename from src/canonical/dex/front-shiny/Pajantom.png
rename to src/cap/dex/front-shiny/Pajantom.png
diff --git a/src/canonical/dex/front-shiny/Pluffle.png b/src/cap/dex/front-shiny/Pluffle.png
similarity index 100%
rename from src/canonical/dex/front-shiny/Pluffle.png
rename to src/cap/dex/front-shiny/Pluffle.png
diff --git a/src/cap/dex/front-shiny/Pyroak.png b/src/cap/dex/front-shiny/Pyroak.png
new file mode 100644
index 00000000..c6f3b28c
Binary files /dev/null and b/src/cap/dex/front-shiny/Pyroak.png differ
diff --git a/src/canonical/dex/front-shiny/Scratchet.png b/src/cap/dex/front-shiny/Scratchet.png
similarity index 100%
rename from src/canonical/dex/front-shiny/Scratchet.png
rename to src/cap/dex/front-shiny/Scratchet.png
diff --git a/src/canonical/dex/front-shiny/Smogecko.png b/src/cap/dex/front-shiny/Smogecko.png
similarity index 100%
rename from src/canonical/dex/front-shiny/Smogecko.png
rename to src/cap/dex/front-shiny/Smogecko.png
diff --git a/src/cap/dex/front-shiny/Smoguana.png b/src/cap/dex/front-shiny/Smoguana.png
new file mode 100644
index 00000000..228e03c6
Binary files /dev/null and b/src/cap/dex/front-shiny/Smoguana.png differ
diff --git a/src/canonical/dex/front-shiny/Smokomodo.png b/src/cap/dex/front-shiny/Smokomodo.png
similarity index 100%
rename from src/canonical/dex/front-shiny/Smokomodo.png
rename to src/cap/dex/front-shiny/Smokomodo.png
diff --git a/src/canonical/dex/front-shiny/Snaelstrom.png b/src/cap/dex/front-shiny/Snaelstrom.png
similarity index 100%
rename from src/canonical/dex/front-shiny/Snaelstrom.png
rename to src/cap/dex/front-shiny/Snaelstrom.png
diff --git a/src/canonical/dex/front-shiny/Stratagem.png b/src/cap/dex/front-shiny/Stratagem.png
similarity index 100%
rename from src/canonical/dex/front-shiny/Stratagem.png
rename to src/cap/dex/front-shiny/Stratagem.png
diff --git a/src/canonical/dex/front-shiny/Tomohawk.png b/src/cap/dex/front-shiny/Tomohawk.png
similarity index 100%
rename from src/canonical/dex/front-shiny/Tomohawk.png
rename to src/cap/dex/front-shiny/Tomohawk.png
diff --git a/src/canonical/dex/front/Caribolt.png b/src/cap/dex/front/Caribolt.png
similarity index 100%
rename from src/canonical/dex/front/Caribolt.png
rename to src/cap/dex/front/Caribolt.png
diff --git a/src/canonical/dex/front/Crucibelle--Mega.png b/src/cap/dex/front/Crucibelle--Mega.png
similarity index 100%
rename from src/canonical/dex/front/Crucibelle--Mega.png
rename to src/cap/dex/front/Crucibelle--Mega.png
diff --git a/src/canonical/dex/front/Crucibelle.png b/src/cap/dex/front/Crucibelle.png
similarity index 100%
rename from src/canonical/dex/front/Crucibelle.png
rename to src/cap/dex/front/Crucibelle.png
diff --git a/src/canonical/dex/front/Equilibra.png b/src/cap/dex/front/Equilibra.png
similarity index 100%
rename from src/canonical/dex/front/Equilibra.png
rename to src/cap/dex/front/Equilibra.png
diff --git a/src/canonical/dex/front/Fidgit.png b/src/cap/dex/front/Fidgit.png
similarity index 100%
rename from src/canonical/dex/front/Fidgit.png
rename to src/cap/dex/front/Fidgit.png
diff --git a/src/canonical/dex/front/Jumbao.png b/src/cap/dex/front/Jumbao.png
similarity index 100%
rename from src/canonical/dex/front/Jumbao.png
rename to src/cap/dex/front/Jumbao.png
diff --git a/src/canonical/dex/front/Kerfluffle.png b/src/cap/dex/front/Kerfluffle.png
similarity index 100%
rename from src/canonical/dex/front/Kerfluffle.png
rename to src/cap/dex/front/Kerfluffle.png
diff --git a/src/cap/dex/front/Kitsunoh.png b/src/cap/dex/front/Kitsunoh.png
new file mode 100644
index 00000000..b552783d
Binary files /dev/null and b/src/cap/dex/front/Kitsunoh.png differ
diff --git a/src/canonical/dex/front/Mollux.png b/src/cap/dex/front/Mollux.png
similarity index 100%
rename from src/canonical/dex/front/Mollux.png
rename to src/cap/dex/front/Mollux.png
diff --git a/src/canonical/dex/front/Pajantom.png b/src/cap/dex/front/Pajantom.png
similarity index 100%
rename from src/canonical/dex/front/Pajantom.png
rename to src/cap/dex/front/Pajantom.png
diff --git a/src/canonical/dex/front/Pluffle.png b/src/cap/dex/front/Pluffle.png
similarity index 100%
rename from src/canonical/dex/front/Pluffle.png
rename to src/cap/dex/front/Pluffle.png
diff --git a/src/cap/dex/front/Pyroak.png b/src/cap/dex/front/Pyroak.png
new file mode 100644
index 00000000..97373146
Binary files /dev/null and b/src/cap/dex/front/Pyroak.png differ
diff --git a/src/canonical/dex/front/Scratchet.png b/src/cap/dex/front/Scratchet.png
similarity index 100%
rename from src/canonical/dex/front/Scratchet.png
rename to src/cap/dex/front/Scratchet.png
diff --git a/src/canonical/dex/front/Smogecko.png b/src/cap/dex/front/Smogecko.png
similarity index 100%
rename from src/canonical/dex/front/Smogecko.png
rename to src/cap/dex/front/Smogecko.png
diff --git a/src/cap/dex/front/Smoguana.png b/src/cap/dex/front/Smoguana.png
new file mode 100644
index 00000000..ae0ba416
Binary files /dev/null and b/src/cap/dex/front/Smoguana.png differ
diff --git a/src/canonical/dex/front/Smokomodo.png b/src/cap/dex/front/Smokomodo.png
similarity index 100%
rename from src/canonical/dex/front/Smokomodo.png
rename to src/cap/dex/front/Smokomodo.png
diff --git a/src/canonical/dex/front/Snaelstrom.png b/src/cap/dex/front/Snaelstrom.png
similarity index 100%
rename from src/canonical/dex/front/Snaelstrom.png
rename to src/cap/dex/front/Snaelstrom.png
diff --git a/src/canonical/dex/front/Stratagem.png b/src/cap/dex/front/Stratagem.png
similarity index 100%
rename from src/canonical/dex/front/Stratagem.png
rename to src/cap/dex/front/Stratagem.png
diff --git a/src/canonical/dex/front/Tomohawk.png b/src/cap/dex/front/Tomohawk.png
similarity index 100%
rename from src/canonical/dex/front/Tomohawk.png
rename to src/cap/dex/front/Tomohawk.png
diff --git a/src/cap/models/back-cosmetic/Kitsunoh--Female.gif b/src/cap/models/back-cosmetic/Kitsunoh--Female.gif
new file mode 100644
index 00000000..2fa970ce
Binary files /dev/null and b/src/cap/models/back-cosmetic/Kitsunoh--Female.gif differ
diff --git a/src/cap/models/back-shiny-cosmetic/Kitsunoh--Female.gif b/src/cap/models/back-shiny-cosmetic/Kitsunoh--Female.gif
new file mode 100644
index 00000000..6694d0fe
Binary files /dev/null and b/src/cap/models/back-shiny-cosmetic/Kitsunoh--Female.gif differ
diff --git a/src/cap/models/back-shiny/Kitsunoh.gif b/src/cap/models/back-shiny/Kitsunoh.gif
new file mode 100644
index 00000000..518d3ecc
Binary files /dev/null and b/src/cap/models/back-shiny/Kitsunoh.gif differ
diff --git a/src/cap/models/back-shiny/Smoguana.gif b/src/cap/models/back-shiny/Smoguana.gif
new file mode 100644
index 00000000..1b4e75cb
Binary files /dev/null and b/src/cap/models/back-shiny/Smoguana.gif differ
diff --git a/src/cap/models/back/Kitsunoh.gif b/src/cap/models/back/Kitsunoh.gif
new file mode 100644
index 00000000..b90b32ed
Binary files /dev/null and b/src/cap/models/back/Kitsunoh.gif differ
diff --git a/src/cap/models/back/Smoguana.gif b/src/cap/models/back/Smoguana.gif
new file mode 100644
index 00000000..9584342a
Binary files /dev/null and b/src/cap/models/back/Smoguana.gif differ
diff --git a/src/cap/models/front-cosmetic/Kitsunoh--Female.gif b/src/cap/models/front-cosmetic/Kitsunoh--Female.gif
new file mode 100644
index 00000000..6a9e4030
Binary files /dev/null and b/src/cap/models/front-cosmetic/Kitsunoh--Female.gif differ
diff --git a/src/cap/models/front-shiny-cosmetic/Kitsunoh--Female.gif b/src/cap/models/front-shiny-cosmetic/Kitsunoh--Female.gif
new file mode 100644
index 00000000..6ed1c747
Binary files /dev/null and b/src/cap/models/front-shiny-cosmetic/Kitsunoh--Female.gif differ
diff --git a/src/cap/models/front-shiny/Kitsunoh.gif b/src/cap/models/front-shiny/Kitsunoh.gif
new file mode 100644
index 00000000..de19e967
Binary files /dev/null and b/src/cap/models/front-shiny/Kitsunoh.gif differ
diff --git a/src/cap/models/front-shiny/Smoguana.gif b/src/cap/models/front-shiny/Smoguana.gif
new file mode 100644
index 00000000..4994d28d
Binary files /dev/null and b/src/cap/models/front-shiny/Smoguana.gif differ
diff --git a/src/cap/models/front/Kitsunoh.gif b/src/cap/models/front/Kitsunoh.gif
new file mode 100644
index 00000000..d83f279d
Binary files /dev/null and b/src/cap/models/front/Kitsunoh.gif differ
diff --git a/src/cap/models/front/Smoguana.gif b/src/cap/models/front/Smoguana.gif
new file mode 100644
index 00000000..d0e2ad2b
Binary files /dev/null and b/src/cap/models/front/Smoguana.gif differ