diff --git a/data/api/v2/gender/1/index.json b/data/api/v2/gender/1/index.json
index 3e4ec2cee2..fa7dc0e72d 100644
--- a/data/api/v2/gender/1/index.json
+++ b/data/api/v2/gender/1/index.json
@@ -499,13 +499,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "greninja",
-                "url": "/api/v2/pokemon-species/658/"
-            },
-            "rate": 1
-        },
         {
             "pokemon_species": {
                 "name": "ponyta",
@@ -926,13 +919,6 @@
             },
             "rate": 1
         },
-        {
-            "pokemon_species": {
-                "name": "diggersby",
-                "url": "/api/v2/pokemon-species/660/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "cyndaquil",
@@ -1430,13 +1416,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "fletchinder",
-                "url": "/api/v2/pokemon-species/662/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "skarmory",
@@ -1885,13 +1864,6 @@
             },
             "rate": 2
         },
-        {
-            "pokemon_species": {
-                "name": "talonflame",
-                "url": "/api/v2/pokemon-species/663/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "sableye",
@@ -3215,13 +3187,6 @@
             },
             "rate": 2
         },
-        {
-            "pokemon_species": {
-                "name": "spewpa",
-                "url": "/api/v2/pokemon-species/665/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "tympole",
@@ -3705,13 +3670,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "quilladin",
-                "url": "/api/v2/pokemon-species/651/"
-            },
-            "rate": 1
-        },
         {
             "pokemon_species": {
                 "name": "axew",
@@ -3719,20 +3677,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "chesnaught",
-                "url": "/api/v2/pokemon-species/652/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "braixen",
-                "url": "/api/v2/pokemon-species/654/"
-            },
-            "rate": 1
-        },
         {
             "pokemon_species": {
                 "name": "cubchoo",
@@ -3740,13 +3684,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "delphox",
-                "url": "/api/v2/pokemon-species/655/"
-            },
-            "rate": 1
-        },
         {
             "pokemon_species": {
                 "name": "shelmet",
@@ -3754,13 +3691,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "frogadier",
-                "url": "/api/v2/pokemon-species/657/"
-            },
-            "rate": 1
-        },
         {
             "pokemon_species": {
                 "name": "stunfisk",
@@ -3775,13 +3705,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "pyroar",
-                "url": "/api/v2/pokemon-species/668/"
-            },
-            "rate": 7
-        },
         {
             "pokemon_species": {
                 "name": "druddigon",
@@ -3789,13 +3712,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "floette",
-                "url": "/api/v2/pokemon-species/670/"
-            },
-            "rate": 8
-        },
         {
             "pokemon_species": {
                 "name": "pawniard",
@@ -3803,13 +3719,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "florges",
-                "url": "/api/v2/pokemon-species/671/"
-            },
-            "rate": 8
-        },
         {
             "pokemon_species": {
                 "name": "bouffalant",
@@ -3817,13 +3726,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "gogoat",
-                "url": "/api/v2/pokemon-species/673/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "vullaby",
@@ -3831,13 +3733,6 @@
             },
             "rate": 8
         },
-        {
-            "pokemon_species": {
-                "name": "pangoro",
-                "url": "/api/v2/pokemon-species/675/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "heatmor",
@@ -3859,20 +3754,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "meowstic",
-                "url": "/api/v2/pokemon-species/678/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "doublade",
-                "url": "/api/v2/pokemon-species/680/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "larvesta",
@@ -4034,6 +3915,13 @@
             },
             "rate": 8
         },
+        {
+            "pokemon_species": {
+                "name": "zweilous",
+                "url": "/api/v2/pokemon-species/634/"
+            },
+            "rate": 4
+        },
         {
             "pokemon_species": {
                 "name": "hydreigon",
@@ -4048,6 +3936,125 @@
             },
             "rate": 4
         },
+        {
+            "pokemon_species": {
+                "name": "quilladin",
+                "url": "/api/v2/pokemon-species/651/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "chesnaught",
+                "url": "/api/v2/pokemon-species/652/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "braixen",
+                "url": "/api/v2/pokemon-species/654/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "delphox",
+                "url": "/api/v2/pokemon-species/655/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "frogadier",
+                "url": "/api/v2/pokemon-species/657/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "greninja",
+                "url": "/api/v2/pokemon-species/658/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "diggersby",
+                "url": "/api/v2/pokemon-species/660/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "fletchinder",
+                "url": "/api/v2/pokemon-species/662/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "talonflame",
+                "url": "/api/v2/pokemon-species/663/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "spewpa",
+                "url": "/api/v2/pokemon-species/665/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "pyroar",
+                "url": "/api/v2/pokemon-species/668/"
+            },
+            "rate": 7
+        },
+        {
+            "pokemon_species": {
+                "name": "floette",
+                "url": "/api/v2/pokemon-species/670/"
+            },
+            "rate": 8
+        },
+        {
+            "pokemon_species": {
+                "name": "florges",
+                "url": "/api/v2/pokemon-species/671/"
+            },
+            "rate": 8
+        },
+        {
+            "pokemon_species": {
+                "name": "gogoat",
+                "url": "/api/v2/pokemon-species/673/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "pangoro",
+                "url": "/api/v2/pokemon-species/675/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "meowstic",
+                "url": "/api/v2/pokemon-species/678/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "doublade",
+                "url": "/api/v2/pokemon-species/680/"
+            },
+            "rate": 4
+        },
         {
             "pokemon_species": {
                 "name": "aegislash",
@@ -4344,21 +4351,161 @@
         },
         {
             "pokemon_species": {
-                "name": "toxapex",
-                "url": "/api/v2/pokemon-species/748/"
+                "name": "sylveon",
+                "url": "/api/v2/pokemon-species/700/"
             },
-            "rate": 4
+            "rate": 1
         },
         {
             "pokemon_species": {
-                "name": "mudsdale",
-                "url": "/api/v2/pokemon-species/750/"
+                "name": "sliggoo",
+                "url": "/api/v2/pokemon-species/705/"
             },
             "rate": 4
         },
         {
             "pokemon_species": {
-                "name": "araquanid",
+                "name": "goodra",
+                "url": "/api/v2/pokemon-species/706/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "trevenant",
+                "url": "/api/v2/pokemon-species/709/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "gourgeist",
+                "url": "/api/v2/pokemon-species/711/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "avalugg",
+                "url": "/api/v2/pokemon-species/713/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "noivern",
+                "url": "/api/v2/pokemon-species/715/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "dartrix",
+                "url": "/api/v2/pokemon-species/723/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "decidueye",
+                "url": "/api/v2/pokemon-species/724/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "torracat",
+                "url": "/api/v2/pokemon-species/726/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "incineroar",
+                "url": "/api/v2/pokemon-species/727/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "primarina",
+                "url": "/api/v2/pokemon-species/730/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "trumbeak",
+                "url": "/api/v2/pokemon-species/732/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "toucannon",
+                "url": "/api/v2/pokemon-species/733/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "gumshoos",
+                "url": "/api/v2/pokemon-species/735/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "charjabug",
+                "url": "/api/v2/pokemon-species/737/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "vikavolt",
+                "url": "/api/v2/pokemon-species/738/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "crabominable",
+                "url": "/api/v2/pokemon-species/740/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "ribombee",
+                "url": "/api/v2/pokemon-species/743/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "lycanroc",
+                "url": "/api/v2/pokemon-species/745/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "toxapex",
+                "url": "/api/v2/pokemon-species/748/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "mudsdale",
+                "url": "/api/v2/pokemon-species/750/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "araquanid",
                 "url": "/api/v2/pokemon-species/752/"
             },
             "rate": 4
@@ -4398,13 +4545,6 @@
             },
             "rate": 8
         },
-        {
-            "pokemon_species": {
-                "name": "tsareena",
-                "url": "/api/v2/pokemon-species/763/"
-            },
-            "rate": 8
-        },
         {
             "pokemon_species": {
                 "name": "oranguru",
@@ -4587,6 +4727,111 @@
             },
             "rate": 4
         },
+        {
+            "pokemon_species": {
+                "name": "hakamo-o",
+                "url": "/api/v2/pokemon-species/783/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "kommo-o",
+                "url": "/api/v2/pokemon-species/784/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "thwackey",
+                "url": "/api/v2/pokemon-species/811/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "rillaboom",
+                "url": "/api/v2/pokemon-species/812/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "raboot",
+                "url": "/api/v2/pokemon-species/814/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "cinderace",
+                "url": "/api/v2/pokemon-species/815/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "drizzile",
+                "url": "/api/v2/pokemon-species/817/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "inteleon",
+                "url": "/api/v2/pokemon-species/818/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "greedent",
+                "url": "/api/v2/pokemon-species/820/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "corvisquire",
+                "url": "/api/v2/pokemon-species/822/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "corviknight",
+                "url": "/api/v2/pokemon-species/823/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "dottler",
+                "url": "/api/v2/pokemon-species/825/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "thievul",
+                "url": "/api/v2/pokemon-species/828/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "eldegoss",
+                "url": "/api/v2/pokemon-species/830/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "dubwool",
+                "url": "/api/v2/pokemon-species/832/"
+            },
+            "rate": 4
+        },
         {
             "pokemon_species": {
                 "name": "drednaw",
@@ -4792,9 +5037,23 @@
         },
         {
             "pokemon_species": {
-                "name": "toxtricity",
-                "url": "/api/v2/pokemon-species/849/"
-            },
+                "name": "sandaconda",
+                "url": "/api/v2/pokemon-species/844/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "barraskewda",
+                "url": "/api/v2/pokemon-species/847/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "toxtricity",
+                "url": "/api/v2/pokemon-species/849/"
+            },
             "rate": 4
         },
         {
@@ -4860,6 +5119,13 @@
             },
             "rate": 4
         },
+        {
+            "pokemon_species": {
+                "name": "runerigus",
+                "url": "/api/v2/pokemon-species/867/"
+            },
+            "rate": 4
+        },
         {
             "pokemon_species": {
                 "name": "alcremie",
@@ -4916,13 +5182,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "ursaluna",
-                "url": "/api/v2/pokemon-species/901/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "basculegion",
@@ -5525,13 +5784,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "zweilous",
-                "url": "/api/v2/pokemon-species/634/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "vivillon",
@@ -5553,83 +5805,6 @@
             },
             "rate": 1
         },
-        {
-            "pokemon_species": {
-                "name": "sylveon",
-                "url": "/api/v2/pokemon-species/700/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "sliggoo",
-                "url": "/api/v2/pokemon-species/705/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "goodra",
-                "url": "/api/v2/pokemon-species/706/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "trevenant",
-                "url": "/api/v2/pokemon-species/709/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "gourgeist",
-                "url": "/api/v2/pokemon-species/711/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "avalugg",
-                "url": "/api/v2/pokemon-species/713/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "noivern",
-                "url": "/api/v2/pokemon-species/715/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "dartrix",
-                "url": "/api/v2/pokemon-species/723/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "decidueye",
-                "url": "/api/v2/pokemon-species/724/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "torracat",
-                "url": "/api/v2/pokemon-species/726/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "incineroar",
-                "url": "/api/v2/pokemon-species/727/"
-            },
-            "rate": 1
-        },
         {
             "pokemon_species": {
                 "name": "brionne",
@@ -5639,66 +5814,10 @@
         },
         {
             "pokemon_species": {
-                "name": "primarina",
-                "url": "/api/v2/pokemon-species/730/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "trumbeak",
-                "url": "/api/v2/pokemon-species/732/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "toucannon",
-                "url": "/api/v2/pokemon-species/733/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "gumshoos",
-                "url": "/api/v2/pokemon-species/735/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "charjabug",
-                "url": "/api/v2/pokemon-species/737/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "vikavolt",
-                "url": "/api/v2/pokemon-species/738/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "crabominable",
-                "url": "/api/v2/pokemon-species/740/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "ribombee",
-                "url": "/api/v2/pokemon-species/743/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "lycanroc",
-                "url": "/api/v2/pokemon-species/745/"
+                "name": "tsareena",
+                "url": "/api/v2/pokemon-species/763/"
             },
-            "rate": 4
+            "rate": 8
         },
         {
             "pokemon_species": {
@@ -5714,111 +5833,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "hakamo-o",
-                "url": "/api/v2/pokemon-species/783/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "kommo-o",
-                "url": "/api/v2/pokemon-species/784/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "baxcalibur",
-                "url": "/api/v2/pokemon-species/998/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "dipplin",
-                "url": "/api/v2/pokemon-species/1011/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "hydrapple",
-                "url": "/api/v2/pokemon-species/1019/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "thwackey",
-                "url": "/api/v2/pokemon-species/811/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "rillaboom",
-                "url": "/api/v2/pokemon-species/812/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "raboot",
-                "url": "/api/v2/pokemon-species/814/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "cinderace",
-                "url": "/api/v2/pokemon-species/815/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "drizzile",
-                "url": "/api/v2/pokemon-species/817/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "inteleon",
-                "url": "/api/v2/pokemon-species/818/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "greedent",
-                "url": "/api/v2/pokemon-species/820/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "corvisquire",
-                "url": "/api/v2/pokemon-species/822/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "corviknight",
-                "url": "/api/v2/pokemon-species/823/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "dottler",
-                "url": "/api/v2/pokemon-species/825/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "orbeetle",
@@ -5828,85 +5842,71 @@
         },
         {
             "pokemon_species": {
-                "name": "thievul",
-                "url": "/api/v2/pokemon-species/828/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "eldegoss",
-                "url": "/api/v2/pokemon-species/830/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "dubwool",
-                "url": "/api/v2/pokemon-species/832/"
+                "name": "appletun",
+                "url": "/api/v2/pokemon-species/842/"
             },
             "rate": 4
         },
         {
             "pokemon_species": {
-                "name": "appletun",
-                "url": "/api/v2/pokemon-species/842/"
+                "name": "ursaluna",
+                "url": "/api/v2/pokemon-species/901/"
             },
             "rate": 4
         },
         {
             "pokemon_species": {
-                "name": "sandaconda",
-                "url": "/api/v2/pokemon-species/844/"
+                "name": "lokix",
+                "url": "/api/v2/pokemon-species/920/"
             },
             "rate": 4
         },
         {
             "pokemon_species": {
-                "name": "barraskewda",
-                "url": "/api/v2/pokemon-species/847/"
+                "name": "arboliva",
+                "url": "/api/v2/pokemon-species/930/"
             },
             "rate": 4
         },
         {
             "pokemon_species": {
-                "name": "runerigus",
-                "url": "/api/v2/pokemon-species/867/"
+                "name": "revavroom",
+                "url": "/api/v2/pokemon-species/966/"
             },
             "rate": 4
         },
         {
             "pokemon_species": {
-                "name": "lokix",
-                "url": "/api/v2/pokemon-species/920/"
+                "name": "arctibax",
+                "url": "/api/v2/pokemon-species/997/"
             },
             "rate": 4
         },
         {
             "pokemon_species": {
-                "name": "arboliva",
-                "url": "/api/v2/pokemon-species/930/"
+                "name": "baxcalibur",
+                "url": "/api/v2/pokemon-species/998/"
             },
             "rate": 4
         },
         {
             "pokemon_species": {
-                "name": "revavroom",
-                "url": "/api/v2/pokemon-species/966/"
+                "name": "dipplin",
+                "url": "/api/v2/pokemon-species/1011/"
             },
             "rate": 4
         },
         {
             "pokemon_species": {
-                "name": "arctibax",
-                "url": "/api/v2/pokemon-species/997/"
+                "name": "archaludon",
+                "url": "/api/v2/pokemon-species/1018/"
             },
             "rate": 4
         },
         {
             "pokemon_species": {
-                "name": "archaludon",
-                "url": "/api/v2/pokemon-species/1018/"
+                "name": "hydrapple",
+                "url": "/api/v2/pokemon-species/1019/"
             },
             "rate": 4
         }
diff --git a/data/api/v2/gender/2/index.json b/data/api/v2/gender/2/index.json
index 653bf7a067..1068fcb06c 100644
--- a/data/api/v2/gender/2/index.json
+++ b/data/api/v2/gender/2/index.json
@@ -499,13 +499,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "greninja",
-                "url": "/api/v2/pokemon-species/658/"
-            },
-            "rate": 1
-        },
         {
             "pokemon_species": {
                 "name": "ponyta",
@@ -926,13 +919,6 @@
             },
             "rate": 1
         },
-        {
-            "pokemon_species": {
-                "name": "diggersby",
-                "url": "/api/v2/pokemon-species/660/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "cyndaquil",
@@ -1430,13 +1416,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "fletchinder",
-                "url": "/api/v2/pokemon-species/662/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "skarmory",
@@ -1878,13 +1857,6 @@
             },
             "rate": 2
         },
-        {
-            "pokemon_species": {
-                "name": "talonflame",
-                "url": "/api/v2/pokemon-species/663/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "sableye",
@@ -3187,13 +3159,6 @@
             },
             "rate": 2
         },
-        {
-            "pokemon_species": {
-                "name": "spewpa",
-                "url": "/api/v2/pokemon-species/665/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "tympole",
@@ -3677,13 +3642,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "quilladin",
-                "url": "/api/v2/pokemon-species/651/"
-            },
-            "rate": 1
-        },
         {
             "pokemon_species": {
                 "name": "axew",
@@ -3691,20 +3649,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "chesnaught",
-                "url": "/api/v2/pokemon-species/652/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "braixen",
-                "url": "/api/v2/pokemon-species/654/"
-            },
-            "rate": 1
-        },
         {
             "pokemon_species": {
                 "name": "cubchoo",
@@ -3712,13 +3656,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "delphox",
-                "url": "/api/v2/pokemon-species/655/"
-            },
-            "rate": 1
-        },
         {
             "pokemon_species": {
                 "name": "shelmet",
@@ -3726,13 +3663,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "frogadier",
-                "url": "/api/v2/pokemon-species/657/"
-            },
-            "rate": 1
-        },
         {
             "pokemon_species": {
                 "name": "stunfisk",
@@ -3747,13 +3677,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "pyroar",
-                "url": "/api/v2/pokemon-species/668/"
-            },
-            "rate": 7
-        },
         {
             "pokemon_species": {
                 "name": "druddigon",
@@ -3782,20 +3705,6 @@
             },
             "rate": 0
         },
-        {
-            "pokemon_species": {
-                "name": "gogoat",
-                "url": "/api/v2/pokemon-species/673/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "pangoro",
-                "url": "/api/v2/pokemon-species/675/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "heatmor",
@@ -3817,20 +3726,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "meowstic",
-                "url": "/api/v2/pokemon-species/678/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "doublade",
-                "url": "/api/v2/pokemon-species/680/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "larvesta",
@@ -4006,6 +3901,13 @@
             },
             "rate": 0
         },
+        {
+            "pokemon_species": {
+                "name": "zweilous",
+                "url": "/api/v2/pokemon-species/634/"
+            },
+            "rate": 4
+        },
         {
             "pokemon_species": {
                 "name": "hydreigon",
@@ -4020,6 +3922,111 @@
             },
             "rate": 4
         },
+        {
+            "pokemon_species": {
+                "name": "quilladin",
+                "url": "/api/v2/pokemon-species/651/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "chesnaught",
+                "url": "/api/v2/pokemon-species/652/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "braixen",
+                "url": "/api/v2/pokemon-species/654/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "delphox",
+                "url": "/api/v2/pokemon-species/655/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "frogadier",
+                "url": "/api/v2/pokemon-species/657/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "greninja",
+                "url": "/api/v2/pokemon-species/658/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "diggersby",
+                "url": "/api/v2/pokemon-species/660/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "fletchinder",
+                "url": "/api/v2/pokemon-species/662/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "talonflame",
+                "url": "/api/v2/pokemon-species/663/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "spewpa",
+                "url": "/api/v2/pokemon-species/665/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "pyroar",
+                "url": "/api/v2/pokemon-species/668/"
+            },
+            "rate": 7
+        },
+        {
+            "pokemon_species": {
+                "name": "gogoat",
+                "url": "/api/v2/pokemon-species/673/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "pangoro",
+                "url": "/api/v2/pokemon-species/675/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "meowstic",
+                "url": "/api/v2/pokemon-species/678/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "doublade",
+                "url": "/api/v2/pokemon-species/680/"
+            },
+            "rate": 4
+        },
         {
             "pokemon_species": {
                 "name": "aegislash",
@@ -4309,65 +4316,205 @@
         },
         {
             "pokemon_species": {
-                "name": "toxapex",
-                "url": "/api/v2/pokemon-species/748/"
+                "name": "sylveon",
+                "url": "/api/v2/pokemon-species/700/"
             },
-            "rate": 4
+            "rate": 1
         },
         {
             "pokemon_species": {
-                "name": "mudsdale",
-                "url": "/api/v2/pokemon-species/750/"
+                "name": "sliggoo",
+                "url": "/api/v2/pokemon-species/705/"
             },
             "rate": 4
         },
         {
             "pokemon_species": {
-                "name": "araquanid",
-                "url": "/api/v2/pokemon-species/752/"
+                "name": "goodra",
+                "url": "/api/v2/pokemon-species/706/"
             },
             "rate": 4
         },
         {
             "pokemon_species": {
-                "name": "lurantis",
-                "url": "/api/v2/pokemon-species/754/"
+                "name": "trevenant",
+                "url": "/api/v2/pokemon-species/709/"
             },
             "rate": 4
         },
         {
             "pokemon_species": {
-                "name": "shiinotic",
-                "url": "/api/v2/pokemon-species/756/"
+                "name": "gourgeist",
+                "url": "/api/v2/pokemon-species/711/"
             },
             "rate": 4
         },
         {
             "pokemon_species": {
-                "name": "bewear",
-                "url": "/api/v2/pokemon-species/760/"
+                "name": "avalugg",
+                "url": "/api/v2/pokemon-species/713/"
             },
             "rate": 4
         },
         {
             "pokemon_species": {
-                "name": "oranguru",
-                "url": "/api/v2/pokemon-species/765/"
+                "name": "noivern",
+                "url": "/api/v2/pokemon-species/715/"
             },
             "rate": 4
         },
         {
             "pokemon_species": {
-                "name": "passimian",
-                "url": "/api/v2/pokemon-species/766/"
+                "name": "dartrix",
+                "url": "/api/v2/pokemon-species/723/"
             },
-            "rate": 4
+            "rate": 1
         },
         {
             "pokemon_species": {
-                "name": "wimpod",
-                "url": "/api/v2/pokemon-species/767/"
-            },
+                "name": "decidueye",
+                "url": "/api/v2/pokemon-species/724/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "torracat",
+                "url": "/api/v2/pokemon-species/726/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "incineroar",
+                "url": "/api/v2/pokemon-species/727/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "primarina",
+                "url": "/api/v2/pokemon-species/730/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "trumbeak",
+                "url": "/api/v2/pokemon-species/732/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "toucannon",
+                "url": "/api/v2/pokemon-species/733/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "gumshoos",
+                "url": "/api/v2/pokemon-species/735/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "charjabug",
+                "url": "/api/v2/pokemon-species/737/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "vikavolt",
+                "url": "/api/v2/pokemon-species/738/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "crabominable",
+                "url": "/api/v2/pokemon-species/740/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "ribombee",
+                "url": "/api/v2/pokemon-species/743/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "lycanroc",
+                "url": "/api/v2/pokemon-species/745/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "toxapex",
+                "url": "/api/v2/pokemon-species/748/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "mudsdale",
+                "url": "/api/v2/pokemon-species/750/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "araquanid",
+                "url": "/api/v2/pokemon-species/752/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "lurantis",
+                "url": "/api/v2/pokemon-species/754/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "shiinotic",
+                "url": "/api/v2/pokemon-species/756/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "bewear",
+                "url": "/api/v2/pokemon-species/760/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "oranguru",
+                "url": "/api/v2/pokemon-species/765/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "passimian",
+                "url": "/api/v2/pokemon-species/766/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "wimpod",
+                "url": "/api/v2/pokemon-species/767/"
+            },
             "rate": 4
         },
         {
@@ -4531,6 +4678,111 @@
             },
             "rate": 4
         },
+        {
+            "pokemon_species": {
+                "name": "hakamo-o",
+                "url": "/api/v2/pokemon-species/783/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "kommo-o",
+                "url": "/api/v2/pokemon-species/784/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "thwackey",
+                "url": "/api/v2/pokemon-species/811/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "rillaboom",
+                "url": "/api/v2/pokemon-species/812/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "raboot",
+                "url": "/api/v2/pokemon-species/814/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "cinderace",
+                "url": "/api/v2/pokemon-species/815/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "drizzile",
+                "url": "/api/v2/pokemon-species/817/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "inteleon",
+                "url": "/api/v2/pokemon-species/818/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "greedent",
+                "url": "/api/v2/pokemon-species/820/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "corvisquire",
+                "url": "/api/v2/pokemon-species/822/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "corviknight",
+                "url": "/api/v2/pokemon-species/823/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "dottler",
+                "url": "/api/v2/pokemon-species/825/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "thievul",
+                "url": "/api/v2/pokemon-species/828/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "eldegoss",
+                "url": "/api/v2/pokemon-species/830/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "dubwool",
+                "url": "/api/v2/pokemon-species/832/"
+            },
+            "rate": 4
+        },
         {
             "pokemon_species": {
                 "name": "drednaw",
@@ -4722,36 +4974,43 @@
         },
         {
             "pokemon_species": {
-                "name": "toxtricity",
-                "url": "/api/v2/pokemon-species/849/"
+                "name": "sandaconda",
+                "url": "/api/v2/pokemon-species/844/"
             },
             "rate": 4
         },
         {
             "pokemon_species": {
-                "name": "centiskorch",
-                "url": "/api/v2/pokemon-species/851/"
+                "name": "barraskewda",
+                "url": "/api/v2/pokemon-species/847/"
             },
             "rate": 4
         },
         {
             "pokemon_species": {
-                "name": "grapploct",
-                "url": "/api/v2/pokemon-species/853/"
+                "name": "toxtricity",
+                "url": "/api/v2/pokemon-species/849/"
             },
             "rate": 4
         },
         {
             "pokemon_species": {
-                "name": "morgrem",
-                "url": "/api/v2/pokemon-species/860/"
+                "name": "centiskorch",
+                "url": "/api/v2/pokemon-species/851/"
             },
-            "rate": 0
+            "rate": 4
         },
         {
             "pokemon_species": {
-                "name": "grimmsnarl",
-                "url": "/api/v2/pokemon-species/861/"
+                "name": "grapploct",
+                "url": "/api/v2/pokemon-species/853/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "morgrem",
+                "url": "/api/v2/pokemon-species/860/"
             },
             "rate": 0
         },
@@ -4790,6 +5049,13 @@
             },
             "rate": 4
         },
+        {
+            "pokemon_species": {
+                "name": "runerigus",
+                "url": "/api/v2/pokemon-species/867/"
+            },
+            "rate": 4
+        },
         {
             "pokemon_species": {
                 "name": "frosmoth",
@@ -4839,13 +5105,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "ursaluna",
-                "url": "/api/v2/pokemon-species/901/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "basculegion",
@@ -5448,13 +5707,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "zweilous",
-                "url": "/api/v2/pokemon-species/634/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "vivillon",
@@ -5476,83 +5728,6 @@
             },
             "rate": 1
         },
-        {
-            "pokemon_species": {
-                "name": "sylveon",
-                "url": "/api/v2/pokemon-species/700/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "sliggoo",
-                "url": "/api/v2/pokemon-species/705/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "goodra",
-                "url": "/api/v2/pokemon-species/706/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "trevenant",
-                "url": "/api/v2/pokemon-species/709/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "gourgeist",
-                "url": "/api/v2/pokemon-species/711/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "avalugg",
-                "url": "/api/v2/pokemon-species/713/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "noivern",
-                "url": "/api/v2/pokemon-species/715/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "dartrix",
-                "url": "/api/v2/pokemon-species/723/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "decidueye",
-                "url": "/api/v2/pokemon-species/724/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "torracat",
-                "url": "/api/v2/pokemon-species/726/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "incineroar",
-                "url": "/api/v2/pokemon-species/727/"
-            },
-            "rate": 1
-        },
         {
             "pokemon_species": {
                 "name": "brionne",
@@ -5560,69 +5735,6 @@
             },
             "rate": 1
         },
-        {
-            "pokemon_species": {
-                "name": "primarina",
-                "url": "/api/v2/pokemon-species/730/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "trumbeak",
-                "url": "/api/v2/pokemon-species/732/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "toucannon",
-                "url": "/api/v2/pokemon-species/733/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "gumshoos",
-                "url": "/api/v2/pokemon-species/735/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "charjabug",
-                "url": "/api/v2/pokemon-species/737/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "vikavolt",
-                "url": "/api/v2/pokemon-species/738/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "crabominable",
-                "url": "/api/v2/pokemon-species/740/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "ribombee",
-                "url": "/api/v2/pokemon-species/743/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "lycanroc",
-                "url": "/api/v2/pokemon-species/745/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "golisopod",
@@ -5637,111 +5749,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "hakamo-o",
-                "url": "/api/v2/pokemon-species/783/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "kommo-o",
-                "url": "/api/v2/pokemon-species/784/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "baxcalibur",
-                "url": "/api/v2/pokemon-species/998/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "dipplin",
-                "url": "/api/v2/pokemon-species/1011/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "hydrapple",
-                "url": "/api/v2/pokemon-species/1019/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "thwackey",
-                "url": "/api/v2/pokemon-species/811/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "rillaboom",
-                "url": "/api/v2/pokemon-species/812/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "raboot",
-                "url": "/api/v2/pokemon-species/814/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "cinderace",
-                "url": "/api/v2/pokemon-species/815/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "drizzile",
-                "url": "/api/v2/pokemon-species/817/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "inteleon",
-                "url": "/api/v2/pokemon-species/818/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "greedent",
-                "url": "/api/v2/pokemon-species/820/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "corvisquire",
-                "url": "/api/v2/pokemon-species/822/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "corviknight",
-                "url": "/api/v2/pokemon-species/823/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "dottler",
-                "url": "/api/v2/pokemon-species/825/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "orbeetle",
@@ -5751,85 +5758,78 @@
         },
         {
             "pokemon_species": {
-                "name": "thievul",
-                "url": "/api/v2/pokemon-species/828/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "eldegoss",
-                "url": "/api/v2/pokemon-species/830/"
+                "name": "appletun",
+                "url": "/api/v2/pokemon-species/842/"
             },
             "rate": 4
         },
         {
             "pokemon_species": {
-                "name": "dubwool",
-                "url": "/api/v2/pokemon-species/832/"
+                "name": "grimmsnarl",
+                "url": "/api/v2/pokemon-species/861/"
             },
-            "rate": 4
+            "rate": 0
         },
         {
             "pokemon_species": {
-                "name": "appletun",
-                "url": "/api/v2/pokemon-species/842/"
+                "name": "ursaluna",
+                "url": "/api/v2/pokemon-species/901/"
             },
             "rate": 4
         },
         {
             "pokemon_species": {
-                "name": "sandaconda",
-                "url": "/api/v2/pokemon-species/844/"
+                "name": "lokix",
+                "url": "/api/v2/pokemon-species/920/"
             },
             "rate": 4
         },
         {
             "pokemon_species": {
-                "name": "barraskewda",
-                "url": "/api/v2/pokemon-species/847/"
+                "name": "arboliva",
+                "url": "/api/v2/pokemon-species/930/"
             },
             "rate": 4
         },
         {
             "pokemon_species": {
-                "name": "runerigus",
-                "url": "/api/v2/pokemon-species/867/"
+                "name": "revavroom",
+                "url": "/api/v2/pokemon-species/966/"
             },
             "rate": 4
         },
         {
             "pokemon_species": {
-                "name": "lokix",
-                "url": "/api/v2/pokemon-species/920/"
+                "name": "arctibax",
+                "url": "/api/v2/pokemon-species/997/"
             },
             "rate": 4
         },
         {
             "pokemon_species": {
-                "name": "arboliva",
-                "url": "/api/v2/pokemon-species/930/"
+                "name": "baxcalibur",
+                "url": "/api/v2/pokemon-species/998/"
             },
             "rate": 4
         },
         {
             "pokemon_species": {
-                "name": "revavroom",
-                "url": "/api/v2/pokemon-species/966/"
+                "name": "dipplin",
+                "url": "/api/v2/pokemon-species/1011/"
             },
             "rate": 4
         },
         {
             "pokemon_species": {
-                "name": "arctibax",
-                "url": "/api/v2/pokemon-species/997/"
+                "name": "archaludon",
+                "url": "/api/v2/pokemon-species/1018/"
             },
             "rate": 4
         },
         {
             "pokemon_species": {
-                "name": "archaludon",
-                "url": "/api/v2/pokemon-species/1018/"
+                "name": "hydrapple",
+                "url": "/api/v2/pokemon-species/1019/"
             },
             "rate": 4
         }
diff --git a/data/api/v2/gender/3/index.json b/data/api/v2/gender/3/index.json
index 9f1b8312a0..ab5a07fe18 100644
--- a/data/api/v2/gender/3/index.json
+++ b/data/api/v2/gender/3/index.json
@@ -688,6 +688,48 @@
             },
             "rate": -1
         },
+        {
+            "pokemon_species": {
+                "name": "silvally",
+                "url": "/api/v2/pokemon-species/773/"
+            },
+            "rate": -1
+        },
+        {
+            "pokemon_species": {
+                "name": "cosmoem",
+                "url": "/api/v2/pokemon-species/790/"
+            },
+            "rate": -1
+        },
+        {
+            "pokemon_species": {
+                "name": "solgaleo",
+                "url": "/api/v2/pokemon-species/791/"
+            },
+            "rate": -1
+        },
+        {
+            "pokemon_species": {
+                "name": "lunala",
+                "url": "/api/v2/pokemon-species/792/"
+            },
+            "rate": -1
+        },
+        {
+            "pokemon_species": {
+                "name": "naganadel",
+                "url": "/api/v2/pokemon-species/804/"
+            },
+            "rate": -1
+        },
+        {
+            "pokemon_species": {
+                "name": "melmetal",
+                "url": "/api/v2/pokemon-species/809/"
+            },
+            "rate": -1
+        },
         {
             "pokemon_species": {
                 "name": "sinistea",
@@ -1031,20 +1073,6 @@
             },
             "rate": -1
         },
-        {
-            "pokemon_species": {
-                "name": "silvally",
-                "url": "/api/v2/pokemon-species/773/"
-            },
-            "rate": -1
-        },
-        {
-            "pokemon_species": {
-                "name": "cosmoem",
-                "url": "/api/v2/pokemon-species/790/"
-            },
-            "rate": -1
-        },
         {
             "pokemon_species": {
                 "name": "gholdengo",
@@ -1058,34 +1086,6 @@
                 "url": "/api/v2/pokemon-species/1013/"
             },
             "rate": -1
-        },
-        {
-            "pokemon_species": {
-                "name": "solgaleo",
-                "url": "/api/v2/pokemon-species/791/"
-            },
-            "rate": -1
-        },
-        {
-            "pokemon_species": {
-                "name": "lunala",
-                "url": "/api/v2/pokemon-species/792/"
-            },
-            "rate": -1
-        },
-        {
-            "pokemon_species": {
-                "name": "naganadel",
-                "url": "/api/v2/pokemon-species/804/"
-            },
-            "rate": -1
-        },
-        {
-            "pokemon_species": {
-                "name": "melmetal",
-                "url": "/api/v2/pokemon-species/809/"
-            },
-            "rate": -1
         }
     ],
     "required_for_evolution": []
diff --git a/data/api/v2/generation/5/index.json b/data/api/v2/generation/5/index.json
index 1c62625c86..2d81cb5480 100644
--- a/data/api/v2/generation/5/index.json
+++ b/data/api/v2/generation/5/index.json
@@ -1435,6 +1435,10 @@
             "name": "mandibuzz",
             "url": "/api/v2/pokemon-species/630/"
         },
+        {
+            "name": "zweilous",
+            "url": "/api/v2/pokemon-species/634/"
+        },
         {
             "name": "hydreigon",
             "url": "/api/v2/pokemon-species/635/"
@@ -1466,10 +1470,6 @@
         {
             "name": "mienshao",
             "url": "/api/v2/pokemon-species/620/"
-        },
-        {
-            "name": "zweilous",
-            "url": "/api/v2/pokemon-species/634/"
         }
     ],
     "types": [],
diff --git a/data/api/v2/generation/6/index.json b/data/api/v2/generation/6/index.json
index 425241621c..655ec85a6d 100644
--- a/data/api/v2/generation/6/index.json
+++ b/data/api/v2/generation/6/index.json
@@ -432,136 +432,136 @@
     ],
     "pokemon_species": [
         {
-            "name": "greninja",
-            "url": "/api/v2/pokemon-species/658/"
+            "name": "chespin",
+            "url": "/api/v2/pokemon-species/650/"
         },
         {
-            "name": "diggersby",
-            "url": "/api/v2/pokemon-species/660/"
+            "name": "fennekin",
+            "url": "/api/v2/pokemon-species/653/"
         },
         {
-            "name": "fletchinder",
-            "url": "/api/v2/pokemon-species/662/"
+            "name": "froakie",
+            "url": "/api/v2/pokemon-species/656/"
         },
         {
-            "name": "talonflame",
-            "url": "/api/v2/pokemon-species/663/"
+            "name": "bunnelby",
+            "url": "/api/v2/pokemon-species/659/"
         },
         {
-            "name": "spewpa",
-            "url": "/api/v2/pokemon-species/665/"
+            "name": "fletchling",
+            "url": "/api/v2/pokemon-species/661/"
         },
         {
-            "name": "quilladin",
-            "url": "/api/v2/pokemon-species/651/"
+            "name": "scatterbug",
+            "url": "/api/v2/pokemon-species/664/"
         },
         {
-            "name": "chesnaught",
-            "url": "/api/v2/pokemon-species/652/"
+            "name": "litleo",
+            "url": "/api/v2/pokemon-species/667/"
         },
         {
-            "name": "braixen",
-            "url": "/api/v2/pokemon-species/654/"
+            "name": "flabebe",
+            "url": "/api/v2/pokemon-species/669/"
         },
         {
-            "name": "delphox",
-            "url": "/api/v2/pokemon-species/655/"
+            "name": "skiddo",
+            "url": "/api/v2/pokemon-species/672/"
         },
         {
-            "name": "frogadier",
-            "url": "/api/v2/pokemon-species/657/"
+            "name": "pancham",
+            "url": "/api/v2/pokemon-species/674/"
         },
         {
-            "name": "pyroar",
-            "url": "/api/v2/pokemon-species/668/"
+            "name": "furfrou",
+            "url": "/api/v2/pokemon-species/676/"
         },
         {
-            "name": "floette",
-            "url": "/api/v2/pokemon-species/670/"
+            "name": "espurr",
+            "url": "/api/v2/pokemon-species/677/"
         },
         {
-            "name": "florges",
-            "url": "/api/v2/pokemon-species/671/"
+            "name": "honedge",
+            "url": "/api/v2/pokemon-species/679/"
         },
         {
-            "name": "gogoat",
-            "url": "/api/v2/pokemon-species/673/"
+            "name": "spritzee",
+            "url": "/api/v2/pokemon-species/682/"
         },
         {
-            "name": "pangoro",
-            "url": "/api/v2/pokemon-species/675/"
+            "name": "swirlix",
+            "url": "/api/v2/pokemon-species/684/"
         },
         {
-            "name": "meowstic",
-            "url": "/api/v2/pokemon-species/678/"
+            "name": "inkay",
+            "url": "/api/v2/pokemon-species/686/"
         },
         {
-            "name": "doublade",
-            "url": "/api/v2/pokemon-species/680/"
+            "name": "quilladin",
+            "url": "/api/v2/pokemon-species/651/"
         },
         {
-            "name": "chespin",
-            "url": "/api/v2/pokemon-species/650/"
+            "name": "chesnaught",
+            "url": "/api/v2/pokemon-species/652/"
         },
         {
-            "name": "fennekin",
-            "url": "/api/v2/pokemon-species/653/"
+            "name": "braixen",
+            "url": "/api/v2/pokemon-species/654/"
         },
         {
-            "name": "froakie",
-            "url": "/api/v2/pokemon-species/656/"
+            "name": "delphox",
+            "url": "/api/v2/pokemon-species/655/"
         },
         {
-            "name": "bunnelby",
-            "url": "/api/v2/pokemon-species/659/"
+            "name": "frogadier",
+            "url": "/api/v2/pokemon-species/657/"
         },
         {
-            "name": "fletchling",
-            "url": "/api/v2/pokemon-species/661/"
+            "name": "greninja",
+            "url": "/api/v2/pokemon-species/658/"
         },
         {
-            "name": "scatterbug",
-            "url": "/api/v2/pokemon-species/664/"
+            "name": "diggersby",
+            "url": "/api/v2/pokemon-species/660/"
         },
         {
-            "name": "litleo",
-            "url": "/api/v2/pokemon-species/667/"
+            "name": "fletchinder",
+            "url": "/api/v2/pokemon-species/662/"
         },
         {
-            "name": "flabebe",
-            "url": "/api/v2/pokemon-species/669/"
+            "name": "talonflame",
+            "url": "/api/v2/pokemon-species/663/"
         },
         {
-            "name": "skiddo",
-            "url": "/api/v2/pokemon-species/672/"
+            "name": "spewpa",
+            "url": "/api/v2/pokemon-species/665/"
         },
         {
-            "name": "pancham",
-            "url": "/api/v2/pokemon-species/674/"
+            "name": "pyroar",
+            "url": "/api/v2/pokemon-species/668/"
         },
         {
-            "name": "furfrou",
-            "url": "/api/v2/pokemon-species/676/"
+            "name": "floette",
+            "url": "/api/v2/pokemon-species/670/"
         },
         {
-            "name": "espurr",
-            "url": "/api/v2/pokemon-species/677/"
+            "name": "florges",
+            "url": "/api/v2/pokemon-species/671/"
         },
         {
-            "name": "honedge",
-            "url": "/api/v2/pokemon-species/679/"
+            "name": "gogoat",
+            "url": "/api/v2/pokemon-species/673/"
         },
         {
-            "name": "spritzee",
-            "url": "/api/v2/pokemon-species/682/"
+            "name": "pangoro",
+            "url": "/api/v2/pokemon-species/675/"
         },
         {
-            "name": "swirlix",
-            "url": "/api/v2/pokemon-species/684/"
+            "name": "meowstic",
+            "url": "/api/v2/pokemon-species/678/"
         },
         {
-            "name": "inkay",
-            "url": "/api/v2/pokemon-species/686/"
+            "name": "doublade",
+            "url": "/api/v2/pokemon-species/680/"
         },
         {
             "name": "aegislash",
@@ -679,18 +679,6 @@
             "name": "aurorus",
             "url": "/api/v2/pokemon-species/699/"
         },
-        {
-            "name": "vivillon",
-            "url": "/api/v2/pokemon-species/666/"
-        },
-        {
-            "name": "malamar",
-            "url": "/api/v2/pokemon-species/687/"
-        },
-        {
-            "name": "tyrantrum",
-            "url": "/api/v2/pokemon-species/697/"
-        },
         {
             "name": "sylveon",
             "url": "/api/v2/pokemon-species/700/"
@@ -718,6 +706,18 @@
         {
             "name": "noivern",
             "url": "/api/v2/pokemon-species/715/"
+        },
+        {
+            "name": "vivillon",
+            "url": "/api/v2/pokemon-species/666/"
+        },
+        {
+            "name": "malamar",
+            "url": "/api/v2/pokemon-species/687/"
+        },
+        {
+            "name": "tyrantrum",
+            "url": "/api/v2/pokemon-species/697/"
         }
     ],
     "types": [
diff --git a/data/api/v2/generation/7/index.json b/data/api/v2/generation/7/index.json
index c8024d1986..5db62fa521 100644
--- a/data/api/v2/generation/7/index.json
+++ b/data/api/v2/generation/7/index.json
@@ -807,6 +807,58 @@
             "name": "comfey",
             "url": "/api/v2/pokemon-species/764/"
         },
+        {
+            "name": "dartrix",
+            "url": "/api/v2/pokemon-species/723/"
+        },
+        {
+            "name": "decidueye",
+            "url": "/api/v2/pokemon-species/724/"
+        },
+        {
+            "name": "torracat",
+            "url": "/api/v2/pokemon-species/726/"
+        },
+        {
+            "name": "incineroar",
+            "url": "/api/v2/pokemon-species/727/"
+        },
+        {
+            "name": "primarina",
+            "url": "/api/v2/pokemon-species/730/"
+        },
+        {
+            "name": "trumbeak",
+            "url": "/api/v2/pokemon-species/732/"
+        },
+        {
+            "name": "toucannon",
+            "url": "/api/v2/pokemon-species/733/"
+        },
+        {
+            "name": "gumshoos",
+            "url": "/api/v2/pokemon-species/735/"
+        },
+        {
+            "name": "charjabug",
+            "url": "/api/v2/pokemon-species/737/"
+        },
+        {
+            "name": "vikavolt",
+            "url": "/api/v2/pokemon-species/738/"
+        },
+        {
+            "name": "crabominable",
+            "url": "/api/v2/pokemon-species/740/"
+        },
+        {
+            "name": "ribombee",
+            "url": "/api/v2/pokemon-species/743/"
+        },
+        {
+            "name": "lycanroc",
+            "url": "/api/v2/pokemon-species/745/"
+        },
         {
             "name": "toxapex",
             "url": "/api/v2/pokemon-species/748/"
@@ -839,10 +891,6 @@
             "name": "steenee",
             "url": "/api/v2/pokemon-species/762/"
         },
-        {
-            "name": "tsareena",
-            "url": "/api/v2/pokemon-species/763/"
-        },
         {
             "name": "oranguru",
             "url": "/api/v2/pokemon-species/765/"
@@ -983,70 +1031,6 @@
             "name": "meltan",
             "url": "/api/v2/pokemon-species/808/"
         },
-        {
-            "name": "dartrix",
-            "url": "/api/v2/pokemon-species/723/"
-        },
-        {
-            "name": "decidueye",
-            "url": "/api/v2/pokemon-species/724/"
-        },
-        {
-            "name": "torracat",
-            "url": "/api/v2/pokemon-species/726/"
-        },
-        {
-            "name": "incineroar",
-            "url": "/api/v2/pokemon-species/727/"
-        },
-        {
-            "name": "brionne",
-            "url": "/api/v2/pokemon-species/729/"
-        },
-        {
-            "name": "primarina",
-            "url": "/api/v2/pokemon-species/730/"
-        },
-        {
-            "name": "trumbeak",
-            "url": "/api/v2/pokemon-species/732/"
-        },
-        {
-            "name": "toucannon",
-            "url": "/api/v2/pokemon-species/733/"
-        },
-        {
-            "name": "gumshoos",
-            "url": "/api/v2/pokemon-species/735/"
-        },
-        {
-            "name": "charjabug",
-            "url": "/api/v2/pokemon-species/737/"
-        },
-        {
-            "name": "vikavolt",
-            "url": "/api/v2/pokemon-species/738/"
-        },
-        {
-            "name": "crabominable",
-            "url": "/api/v2/pokemon-species/740/"
-        },
-        {
-            "name": "ribombee",
-            "url": "/api/v2/pokemon-species/743/"
-        },
-        {
-            "name": "lycanroc",
-            "url": "/api/v2/pokemon-species/745/"
-        },
-        {
-            "name": "golisopod",
-            "url": "/api/v2/pokemon-species/768/"
-        },
-        {
-            "name": "palossand",
-            "url": "/api/v2/pokemon-species/770/"
-        },
         {
             "name": "silvally",
             "url": "/api/v2/pokemon-species/773/"
@@ -1078,6 +1062,22 @@
         {
             "name": "melmetal",
             "url": "/api/v2/pokemon-species/809/"
+        },
+        {
+            "name": "brionne",
+            "url": "/api/v2/pokemon-species/729/"
+        },
+        {
+            "name": "tsareena",
+            "url": "/api/v2/pokemon-species/763/"
+        },
+        {
+            "name": "golisopod",
+            "url": "/api/v2/pokemon-species/768/"
+        },
+        {
+            "name": "palossand",
+            "url": "/api/v2/pokemon-species/770/"
         }
     ],
     "types": [],
diff --git a/data/api/v2/generation/8/index.json b/data/api/v2/generation/8/index.json
index 01092bdb32..0c2a14cc2a 100644
--- a/data/api/v2/generation/8/index.json
+++ b/data/api/v2/generation/8/index.json
@@ -695,6 +695,58 @@
             "name": "applin",
             "url": "/api/v2/pokemon-species/840/"
         },
+        {
+            "name": "thwackey",
+            "url": "/api/v2/pokemon-species/811/"
+        },
+        {
+            "name": "rillaboom",
+            "url": "/api/v2/pokemon-species/812/"
+        },
+        {
+            "name": "raboot",
+            "url": "/api/v2/pokemon-species/814/"
+        },
+        {
+            "name": "cinderace",
+            "url": "/api/v2/pokemon-species/815/"
+        },
+        {
+            "name": "drizzile",
+            "url": "/api/v2/pokemon-species/817/"
+        },
+        {
+            "name": "inteleon",
+            "url": "/api/v2/pokemon-species/818/"
+        },
+        {
+            "name": "greedent",
+            "url": "/api/v2/pokemon-species/820/"
+        },
+        {
+            "name": "corvisquire",
+            "url": "/api/v2/pokemon-species/822/"
+        },
+        {
+            "name": "corviknight",
+            "url": "/api/v2/pokemon-species/823/"
+        },
+        {
+            "name": "dottler",
+            "url": "/api/v2/pokemon-species/825/"
+        },
+        {
+            "name": "thievul",
+            "url": "/api/v2/pokemon-species/828/"
+        },
+        {
+            "name": "eldegoss",
+            "url": "/api/v2/pokemon-species/830/"
+        },
+        {
+            "name": "dubwool",
+            "url": "/api/v2/pokemon-species/832/"
+        },
         {
             "name": "drednaw",
             "url": "/api/v2/pokemon-species/834/"
@@ -855,6 +907,14 @@
             "name": "enamorus",
             "url": "/api/v2/pokemon-species/905/"
         },
+        {
+            "name": "sandaconda",
+            "url": "/api/v2/pokemon-species/844/"
+        },
+        {
+            "name": "barraskewda",
+            "url": "/api/v2/pokemon-species/847/"
+        },
         {
             "name": "toxtricity",
             "url": "/api/v2/pokemon-species/849/"
@@ -883,10 +943,6 @@
             "name": "morgrem",
             "url": "/api/v2/pokemon-species/860/"
         },
-        {
-            "name": "grimmsnarl",
-            "url": "/api/v2/pokemon-species/861/"
-        },
         {
             "name": "obstagoon",
             "url": "/api/v2/pokemon-species/862/"
@@ -907,6 +963,10 @@
             "name": "mr-rime",
             "url": "/api/v2/pokemon-species/866/"
         },
+        {
+            "name": "runerigus",
+            "url": "/api/v2/pokemon-species/867/"
+        },
         {
             "name": "alcremie",
             "url": "/api/v2/pokemon-species/869/"
@@ -939,10 +999,6 @@
             "name": "kleavor",
             "url": "/api/v2/pokemon-species/900/"
         },
-        {
-            "name": "ursaluna",
-            "url": "/api/v2/pokemon-species/901/"
-        },
         {
             "name": "basculegion",
             "url": "/api/v2/pokemon-species/902/"
@@ -955,77 +1011,21 @@
             "name": "overqwil",
             "url": "/api/v2/pokemon-species/904/"
         },
-        {
-            "name": "thwackey",
-            "url": "/api/v2/pokemon-species/811/"
-        },
-        {
-            "name": "rillaboom",
-            "url": "/api/v2/pokemon-species/812/"
-        },
-        {
-            "name": "raboot",
-            "url": "/api/v2/pokemon-species/814/"
-        },
-        {
-            "name": "cinderace",
-            "url": "/api/v2/pokemon-species/815/"
-        },
-        {
-            "name": "drizzile",
-            "url": "/api/v2/pokemon-species/817/"
-        },
-        {
-            "name": "inteleon",
-            "url": "/api/v2/pokemon-species/818/"
-        },
-        {
-            "name": "greedent",
-            "url": "/api/v2/pokemon-species/820/"
-        },
-        {
-            "name": "corvisquire",
-            "url": "/api/v2/pokemon-species/822/"
-        },
-        {
-            "name": "corviknight",
-            "url": "/api/v2/pokemon-species/823/"
-        },
-        {
-            "name": "dottler",
-            "url": "/api/v2/pokemon-species/825/"
-        },
         {
             "name": "orbeetle",
             "url": "/api/v2/pokemon-species/826/"
         },
-        {
-            "name": "thievul",
-            "url": "/api/v2/pokemon-species/828/"
-        },
-        {
-            "name": "eldegoss",
-            "url": "/api/v2/pokemon-species/830/"
-        },
-        {
-            "name": "dubwool",
-            "url": "/api/v2/pokemon-species/832/"
-        },
         {
             "name": "appletun",
             "url": "/api/v2/pokemon-species/842/"
         },
         {
-            "name": "sandaconda",
-            "url": "/api/v2/pokemon-species/844/"
-        },
-        {
-            "name": "barraskewda",
-            "url": "/api/v2/pokemon-species/847/"
+            "name": "grimmsnarl",
+            "url": "/api/v2/pokemon-species/861/"
         },
         {
-            "name": "runerigus",
-            "url": "/api/v2/pokemon-species/867/"
+            "name": "ursaluna",
+            "url": "/api/v2/pokemon-species/901/"
         }
     ],
     "types": [],
diff --git a/data/api/v2/generation/9/index.json b/data/api/v2/generation/9/index.json
index 5f6881c033..7905826769 100644
--- a/data/api/v2/generation/9/index.json
+++ b/data/api/v2/generation/9/index.json
@@ -967,26 +967,6 @@
             "name": "pecharunt",
             "url": "/api/v2/pokemon-species/1025/"
         },
-        {
-            "name": "baxcalibur",
-            "url": "/api/v2/pokemon-species/998/"
-        },
-        {
-            "name": "gholdengo",
-            "url": "/api/v2/pokemon-species/1000/"
-        },
-        {
-            "name": "dipplin",
-            "url": "/api/v2/pokemon-species/1011/"
-        },
-        {
-            "name": "sinistcha",
-            "url": "/api/v2/pokemon-species/1013/"
-        },
-        {
-            "name": "hydrapple",
-            "url": "/api/v2/pokemon-species/1019/"
-        },
         {
             "name": "lokix",
             "url": "/api/v2/pokemon-species/920/"
@@ -1003,9 +983,29 @@
             "name": "arctibax",
             "url": "/api/v2/pokemon-species/997/"
         },
+        {
+            "name": "baxcalibur",
+            "url": "/api/v2/pokemon-species/998/"
+        },
+        {
+            "name": "gholdengo",
+            "url": "/api/v2/pokemon-species/1000/"
+        },
+        {
+            "name": "dipplin",
+            "url": "/api/v2/pokemon-species/1011/"
+        },
+        {
+            "name": "sinistcha",
+            "url": "/api/v2/pokemon-species/1013/"
+        },
         {
             "name": "archaludon",
             "url": "/api/v2/pokemon-species/1018/"
+        },
+        {
+            "name": "hydrapple",
+            "url": "/api/v2/pokemon-species/1019/"
         }
     ],
     "types": [
diff --git a/data/api/v2/growth-rate/1/index.json b/data/api/v2/growth-rate/1/index.json
index 2d86cb7417..11870181ea 100644
--- a/data/api/v2/growth-rate/1/index.json
+++ b/data/api/v2/growth-rate/1/index.json
@@ -944,6 +944,10 @@
             "name": "mandibuzz",
             "url": "/api/v2/pokemon-species/630/"
         },
+        {
+            "name": "zweilous",
+            "url": "/api/v2/pokemon-species/634/"
+        },
         {
             "name": "hydreigon",
             "url": "/api/v2/pokemon-species/635/"
@@ -992,6 +996,14 @@
             "name": "clawitzer",
             "url": "/api/v2/pokemon-species/693/"
         },
+        {
+            "name": "sliggoo",
+            "url": "/api/v2/pokemon-species/705/"
+        },
+        {
+            "name": "goodra",
+            "url": "/api/v2/pokemon-species/706/"
+        },
         {
             "name": "oranguru",
             "url": "/api/v2/pokemon-species/765/"
@@ -1092,6 +1104,38 @@
             "name": "meltan",
             "url": "/api/v2/pokemon-species/808/"
         },
+        {
+            "name": "silvally",
+            "url": "/api/v2/pokemon-species/773/"
+        },
+        {
+            "name": "hakamo-o",
+            "url": "/api/v2/pokemon-species/783/"
+        },
+        {
+            "name": "kommo-o",
+            "url": "/api/v2/pokemon-species/784/"
+        },
+        {
+            "name": "cosmoem",
+            "url": "/api/v2/pokemon-species/790/"
+        },
+        {
+            "name": "solgaleo",
+            "url": "/api/v2/pokemon-species/791/"
+        },
+        {
+            "name": "lunala",
+            "url": "/api/v2/pokemon-species/792/"
+        },
+        {
+            "name": "naganadel",
+            "url": "/api/v2/pokemon-species/804/"
+        },
+        {
+            "name": "melmetal",
+            "url": "/api/v2/pokemon-species/809/"
+        },
         {
             "name": "arrokuda",
             "url": "/api/v2/pokemon-species/846/"
@@ -1172,6 +1216,10 @@
             "name": "enamorus",
             "url": "/api/v2/pokemon-species/905/"
         },
+        {
+            "name": "barraskewda",
+            "url": "/api/v2/pokemon-species/847/"
+        },
         {
             "name": "hattrem",
             "url": "/api/v2/pokemon-species/857/"
@@ -1381,32 +1429,8 @@
             "url": "/api/v2/pokemon-species/473/"
         },
         {
-            "name": "zweilous",
-            "url": "/api/v2/pokemon-species/634/"
-        },
-        {
-            "name": "sliggoo",
-            "url": "/api/v2/pokemon-species/705/"
-        },
-        {
-            "name": "goodra",
-            "url": "/api/v2/pokemon-species/706/"
-        },
-        {
-            "name": "silvally",
-            "url": "/api/v2/pokemon-species/773/"
-        },
-        {
-            "name": "hakamo-o",
-            "url": "/api/v2/pokemon-species/783/"
-        },
-        {
-            "name": "kommo-o",
-            "url": "/api/v2/pokemon-species/784/"
-        },
-        {
-            "name": "cosmoem",
-            "url": "/api/v2/pokemon-species/790/"
+            "name": "arctibax",
+            "url": "/api/v2/pokemon-species/997/"
         },
         {
             "name": "baxcalibur",
@@ -1423,30 +1447,6 @@
         {
             "name": "sinistcha",
             "url": "/api/v2/pokemon-species/1013/"
-        },
-        {
-            "name": "solgaleo",
-            "url": "/api/v2/pokemon-species/791/"
-        },
-        {
-            "name": "lunala",
-            "url": "/api/v2/pokemon-species/792/"
-        },
-        {
-            "name": "naganadel",
-            "url": "/api/v2/pokemon-species/804/"
-        },
-        {
-            "name": "melmetal",
-            "url": "/api/v2/pokemon-species/809/"
-        },
-        {
-            "name": "barraskewda",
-            "url": "/api/v2/pokemon-species/847/"
-        },
-        {
-            "name": "arctibax",
-            "url": "/api/v2/pokemon-species/997/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/growth-rate/2/index.json b/data/api/v2/growth-rate/2/index.json
index 7a44c2ffba..84d5d80698 100644
--- a/data/api/v2/growth-rate/2/index.json
+++ b/data/api/v2/growth-rate/2/index.json
@@ -748,10 +748,6 @@
             "name": "kabutops",
             "url": "/api/v2/pokemon-species/141/"
         },
-        {
-            "name": "diggersby",
-            "url": "/api/v2/pokemon-species/660/"
-        },
         {
             "name": "sentret",
             "url": "/api/v2/pokemon-species/161/"
@@ -1220,10 +1216,6 @@
             "name": "excadrill",
             "url": "/api/v2/pokemon-species/530/"
         },
-        {
-            "name": "spewpa",
-            "url": "/api/v2/pokemon-species/665/"
-        },
         {
             "name": "throh",
             "url": "/api/v2/pokemon-species/538/"
@@ -1396,30 +1388,14 @@
             "name": "golett",
             "url": "/api/v2/pokemon-species/622/"
         },
-        {
-            "name": "floette",
-            "url": "/api/v2/pokemon-species/670/"
-        },
         {
             "name": "pawniard",
             "url": "/api/v2/pokemon-species/624/"
         },
-        {
-            "name": "florges",
-            "url": "/api/v2/pokemon-species/671/"
-        },
         {
             "name": "bouffalant",
             "url": "/api/v2/pokemon-species/626/"
         },
-        {
-            "name": "gogoat",
-            "url": "/api/v2/pokemon-species/673/"
-        },
-        {
-            "name": "pangoro",
-            "url": "/api/v2/pokemon-species/675/"
-        },
         {
             "name": "heatmor",
             "url": "/api/v2/pokemon-species/631/"
@@ -1428,14 +1404,6 @@
             "name": "durant",
             "url": "/api/v2/pokemon-species/632/"
         },
-        {
-            "name": "meowstic",
-            "url": "/api/v2/pokemon-species/678/"
-        },
-        {
-            "name": "doublade",
-            "url": "/api/v2/pokemon-species/680/"
-        },
         {
             "name": "bunnelby",
             "url": "/api/v2/pokemon-species/659/"
@@ -1496,6 +1464,38 @@
             "name": "bisharp",
             "url": "/api/v2/pokemon-species/625/"
         },
+        {
+            "name": "diggersby",
+            "url": "/api/v2/pokemon-species/660/"
+        },
+        {
+            "name": "spewpa",
+            "url": "/api/v2/pokemon-species/665/"
+        },
+        {
+            "name": "floette",
+            "url": "/api/v2/pokemon-species/670/"
+        },
+        {
+            "name": "florges",
+            "url": "/api/v2/pokemon-species/671/"
+        },
+        {
+            "name": "gogoat",
+            "url": "/api/v2/pokemon-species/673/"
+        },
+        {
+            "name": "pangoro",
+            "url": "/api/v2/pokemon-species/675/"
+        },
+        {
+            "name": "meowstic",
+            "url": "/api/v2/pokemon-species/678/"
+        },
+        {
+            "name": "doublade",
+            "url": "/api/v2/pokemon-species/680/"
+        },
         {
             "name": "aegislash",
             "url": "/api/v2/pokemon-species/681/"
@@ -1624,6 +1624,58 @@
             "name": "aurorus",
             "url": "/api/v2/pokemon-species/699/"
         },
+        {
+            "name": "sylveon",
+            "url": "/api/v2/pokemon-species/700/"
+        },
+        {
+            "name": "trevenant",
+            "url": "/api/v2/pokemon-species/709/"
+        },
+        {
+            "name": "gourgeist",
+            "url": "/api/v2/pokemon-species/711/"
+        },
+        {
+            "name": "avalugg",
+            "url": "/api/v2/pokemon-species/713/"
+        },
+        {
+            "name": "noivern",
+            "url": "/api/v2/pokemon-species/715/"
+        },
+        {
+            "name": "trumbeak",
+            "url": "/api/v2/pokemon-species/732/"
+        },
+        {
+            "name": "toucannon",
+            "url": "/api/v2/pokemon-species/733/"
+        },
+        {
+            "name": "gumshoos",
+            "url": "/api/v2/pokemon-species/735/"
+        },
+        {
+            "name": "charjabug",
+            "url": "/api/v2/pokemon-species/737/"
+        },
+        {
+            "name": "vikavolt",
+            "url": "/api/v2/pokemon-species/738/"
+        },
+        {
+            "name": "crabominable",
+            "url": "/api/v2/pokemon-species/740/"
+        },
+        {
+            "name": "ribombee",
+            "url": "/api/v2/pokemon-species/743/"
+        },
+        {
+            "name": "lycanroc",
+            "url": "/api/v2/pokemon-species/745/"
+        },
         {
             "name": "toxapex",
             "url": "/api/v2/pokemon-species/748/"
@@ -1708,6 +1760,22 @@
             "name": "nymble",
             "url": "/api/v2/pokemon-species/919/"
         },
+        {
+            "name": "greedent",
+            "url": "/api/v2/pokemon-species/820/"
+        },
+        {
+            "name": "dottler",
+            "url": "/api/v2/pokemon-species/825/"
+        },
+        {
+            "name": "eldegoss",
+            "url": "/api/v2/pokemon-species/830/"
+        },
+        {
+            "name": "dubwool",
+            "url": "/api/v2/pokemon-species/832/"
+        },
         {
             "name": "drednaw",
             "url": "/api/v2/pokemon-species/834/"
@@ -1764,6 +1832,10 @@
             "name": "lechonk",
             "url": "/api/v2/pokemon-species/915/"
         },
+        {
+            "name": "sandaconda",
+            "url": "/api/v2/pokemon-species/844/"
+        },
         {
             "name": "centiskorch",
             "url": "/api/v2/pokemon-species/851/"
@@ -1776,10 +1848,6 @@
             "name": "morgrem",
             "url": "/api/v2/pokemon-species/860/"
         },
-        {
-            "name": "grimmsnarl",
-            "url": "/api/v2/pokemon-species/861/"
-        },
         {
             "name": "obstagoon",
             "url": "/api/v2/pokemon-species/862/"
@@ -1796,6 +1864,10 @@
             "name": "mr-rime",
             "url": "/api/v2/pokemon-species/866/"
         },
+        {
+            "name": "runerigus",
+            "url": "/api/v2/pokemon-species/867/"
+        },
         {
             "name": "alcremie",
             "url": "/api/v2/pokemon-species/869/"
@@ -1812,10 +1884,6 @@
             "name": "kleavor",
             "url": "/api/v2/pokemon-species/900/"
         },
-        {
-            "name": "ursaluna",
-            "url": "/api/v2/pokemon-species/901/"
-        },
         {
             "name": "basculegion",
             "url": "/api/v2/pokemon-species/902/"
@@ -1924,58 +1992,6 @@
             "name": "tyrantrum",
             "url": "/api/v2/pokemon-species/697/"
         },
-        {
-            "name": "sylveon",
-            "url": "/api/v2/pokemon-species/700/"
-        },
-        {
-            "name": "trevenant",
-            "url": "/api/v2/pokemon-species/709/"
-        },
-        {
-            "name": "gourgeist",
-            "url": "/api/v2/pokemon-species/711/"
-        },
-        {
-            "name": "avalugg",
-            "url": "/api/v2/pokemon-species/713/"
-        },
-        {
-            "name": "noivern",
-            "url": "/api/v2/pokemon-species/715/"
-        },
-        {
-            "name": "trumbeak",
-            "url": "/api/v2/pokemon-species/732/"
-        },
-        {
-            "name": "toucannon",
-            "url": "/api/v2/pokemon-species/733/"
-        },
-        {
-            "name": "gumshoos",
-            "url": "/api/v2/pokemon-species/735/"
-        },
-        {
-            "name": "charjabug",
-            "url": "/api/v2/pokemon-species/737/"
-        },
-        {
-            "name": "vikavolt",
-            "url": "/api/v2/pokemon-species/738/"
-        },
-        {
-            "name": "crabominable",
-            "url": "/api/v2/pokemon-species/740/"
-        },
-        {
-            "name": "ribombee",
-            "url": "/api/v2/pokemon-species/743/"
-        },
-        {
-            "name": "lycanroc",
-            "url": "/api/v2/pokemon-species/745/"
-        },
         {
             "name": "golisopod",
             "url": "/api/v2/pokemon-species/768/"
@@ -1984,33 +2000,17 @@
             "name": "palossand",
             "url": "/api/v2/pokemon-species/770/"
         },
-        {
-            "name": "greedent",
-            "url": "/api/v2/pokemon-species/820/"
-        },
-        {
-            "name": "dottler",
-            "url": "/api/v2/pokemon-species/825/"
-        },
         {
             "name": "orbeetle",
             "url": "/api/v2/pokemon-species/826/"
         },
         {
-            "name": "eldegoss",
-            "url": "/api/v2/pokemon-species/830/"
-        },
-        {
-            "name": "dubwool",
-            "url": "/api/v2/pokemon-species/832/"
-        },
-        {
-            "name": "sandaconda",
-            "url": "/api/v2/pokemon-species/844/"
+            "name": "grimmsnarl",
+            "url": "/api/v2/pokemon-species/861/"
         },
         {
-            "name": "runerigus",
-            "url": "/api/v2/pokemon-species/867/"
+            "name": "ursaluna",
+            "url": "/api/v2/pokemon-species/901/"
         },
         {
             "name": "lokix",
diff --git a/data/api/v2/growth-rate/3/index.json b/data/api/v2/growth-rate/3/index.json
index ee2909583d..2f0d685c39 100644
--- a/data/api/v2/growth-rate/3/index.json
+++ b/data/api/v2/growth-rate/3/index.json
@@ -656,6 +656,10 @@
             "name": "yamper",
             "url": "/api/v2/pokemon-species/835/"
         },
+        {
+            "name": "thievul",
+            "url": "/api/v2/pokemon-species/828/"
+        },
         {
             "name": "boltund",
             "url": "/api/v2/pokemon-species/836/"
@@ -691,10 +695,6 @@
         {
             "name": "delcatty",
             "url": "/api/v2/pokemon-species/301/"
-        },
-        {
-            "name": "thievul",
-            "url": "/api/v2/pokemon-species/828/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/growth-rate/4/index.json b/data/api/v2/growth-rate/4/index.json
index 3899dfc9be..b4491be902 100644
--- a/data/api/v2/growth-rate/4/index.json
+++ b/data/api/v2/growth-rate/4/index.json
@@ -564,10 +564,6 @@
             "name": "graveler",
             "url": "/api/v2/pokemon-species/75/"
         },
-        {
-            "name": "greninja",
-            "url": "/api/v2/pokemon-species/658/"
-        },
         {
             "name": "gastly",
             "url": "/api/v2/pokemon-species/92/"
@@ -672,10 +668,6 @@
             "name": "sunflora",
             "url": "/api/v2/pokemon-species/192/"
         },
-        {
-            "name": "fletchinder",
-            "url": "/api/v2/pokemon-species/662/"
-        },
         {
             "name": "celebi",
             "url": "/api/v2/pokemon-species/251/"
@@ -760,10 +752,6 @@
             "name": "exploud",
             "url": "/api/v2/pokemon-species/295/"
         },
-        {
-            "name": "talonflame",
-            "url": "/api/v2/pokemon-species/663/"
-        },
         {
             "name": "sableye",
             "url": "/api/v2/pokemon-species/302/"
@@ -1100,6 +1088,30 @@
             "name": "lampent",
             "url": "/api/v2/pokemon-species/608/"
         },
+        {
+            "name": "mienfoo",
+            "url": "/api/v2/pokemon-species/619/"
+        },
+        {
+            "name": "chespin",
+            "url": "/api/v2/pokemon-species/650/"
+        },
+        {
+            "name": "fennekin",
+            "url": "/api/v2/pokemon-species/653/"
+        },
+        {
+            "name": "froakie",
+            "url": "/api/v2/pokemon-species/656/"
+        },
+        {
+            "name": "fletchling",
+            "url": "/api/v2/pokemon-species/661/"
+        },
+        {
+            "name": "litleo",
+            "url": "/api/v2/pokemon-species/667/"
+        },
         {
             "name": "quilladin",
             "url": "/api/v2/pokemon-species/651/"
@@ -1121,32 +1133,20 @@
             "url": "/api/v2/pokemon-species/657/"
         },
         {
-            "name": "mienfoo",
-            "url": "/api/v2/pokemon-species/619/"
-        },
-        {
-            "name": "pyroar",
-            "url": "/api/v2/pokemon-species/668/"
-        },
-        {
-            "name": "chespin",
-            "url": "/api/v2/pokemon-species/650/"
-        },
-        {
-            "name": "fennekin",
-            "url": "/api/v2/pokemon-species/653/"
+            "name": "greninja",
+            "url": "/api/v2/pokemon-species/658/"
         },
         {
-            "name": "froakie",
-            "url": "/api/v2/pokemon-species/656/"
+            "name": "fletchinder",
+            "url": "/api/v2/pokemon-species/662/"
         },
         {
-            "name": "fletchling",
-            "url": "/api/v2/pokemon-species/661/"
+            "name": "talonflame",
+            "url": "/api/v2/pokemon-species/663/"
         },
         {
-            "name": "litleo",
-            "url": "/api/v2/pokemon-species/667/"
+            "name": "pyroar",
+            "url": "/api/v2/pokemon-species/668/"
         },
         {
             "name": "rowlet",
@@ -1165,12 +1165,28 @@
             "url": "/api/v2/pokemon-species/761/"
         },
         {
-            "name": "steenee",
-            "url": "/api/v2/pokemon-species/762/"
+            "name": "dartrix",
+            "url": "/api/v2/pokemon-species/723/"
         },
         {
-            "name": "tsareena",
-            "url": "/api/v2/pokemon-species/763/"
+            "name": "decidueye",
+            "url": "/api/v2/pokemon-species/724/"
+        },
+        {
+            "name": "torracat",
+            "url": "/api/v2/pokemon-species/726/"
+        },
+        {
+            "name": "incineroar",
+            "url": "/api/v2/pokemon-species/727/"
+        },
+        {
+            "name": "primarina",
+            "url": "/api/v2/pokemon-species/730/"
+        },
+        {
+            "name": "steenee",
+            "url": "/api/v2/pokemon-species/762/"
         },
         {
             "name": "minior",
@@ -1196,6 +1212,38 @@
             "name": "rolycoly",
             "url": "/api/v2/pokemon-species/837/"
         },
+        {
+            "name": "thwackey",
+            "url": "/api/v2/pokemon-species/811/"
+        },
+        {
+            "name": "rillaboom",
+            "url": "/api/v2/pokemon-species/812/"
+        },
+        {
+            "name": "raboot",
+            "url": "/api/v2/pokemon-species/814/"
+        },
+        {
+            "name": "cinderace",
+            "url": "/api/v2/pokemon-species/815/"
+        },
+        {
+            "name": "drizzile",
+            "url": "/api/v2/pokemon-species/817/"
+        },
+        {
+            "name": "inteleon",
+            "url": "/api/v2/pokemon-species/818/"
+        },
+        {
+            "name": "corvisquire",
+            "url": "/api/v2/pokemon-species/822/"
+        },
+        {
+            "name": "corviknight",
+            "url": "/api/v2/pokemon-species/823/"
+        },
         {
             "name": "carkol",
             "url": "/api/v2/pokemon-species/838/"
@@ -1412,61 +1460,13 @@
             "name": "mienshao",
             "url": "/api/v2/pokemon-species/620/"
         },
-        {
-            "name": "dartrix",
-            "url": "/api/v2/pokemon-species/723/"
-        },
-        {
-            "name": "decidueye",
-            "url": "/api/v2/pokemon-species/724/"
-        },
-        {
-            "name": "torracat",
-            "url": "/api/v2/pokemon-species/726/"
-        },
-        {
-            "name": "incineroar",
-            "url": "/api/v2/pokemon-species/727/"
-        },
         {
             "name": "brionne",
             "url": "/api/v2/pokemon-species/729/"
         },
         {
-            "name": "primarina",
-            "url": "/api/v2/pokemon-species/730/"
-        },
-        {
-            "name": "thwackey",
-            "url": "/api/v2/pokemon-species/811/"
-        },
-        {
-            "name": "rillaboom",
-            "url": "/api/v2/pokemon-species/812/"
-        },
-        {
-            "name": "raboot",
-            "url": "/api/v2/pokemon-species/814/"
-        },
-        {
-            "name": "cinderace",
-            "url": "/api/v2/pokemon-species/815/"
-        },
-        {
-            "name": "drizzile",
-            "url": "/api/v2/pokemon-species/817/"
-        },
-        {
-            "name": "inteleon",
-            "url": "/api/v2/pokemon-species/818/"
-        },
-        {
-            "name": "corvisquire",
-            "url": "/api/v2/pokemon-species/822/"
-        },
-        {
-            "name": "corviknight",
-            "url": "/api/v2/pokemon-species/823/"
+            "name": "tsareena",
+            "url": "/api/v2/pokemon-species/763/"
         },
         {
             "name": "arboliva",
diff --git a/data/api/v2/growth-rate/5/index.json b/data/api/v2/growth-rate/5/index.json
index b97f9a3958..504ea069a3 100644
--- a/data/api/v2/growth-rate/5/index.json
+++ b/data/api/v2/growth-rate/5/index.json
@@ -536,13 +536,13 @@
             "name": "squawkabilly",
             "url": "/api/v2/pokemon-species/931/"
         },
-        {
-            "name": "hydrapple",
-            "url": "/api/v2/pokemon-species/1019/"
-        },
         {
             "name": "appletun",
             "url": "/api/v2/pokemon-species/842/"
+        },
+        {
+            "name": "hydrapple",
+            "url": "/api/v2/pokemon-species/1019/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/meta/index.json b/data/api/v2/meta/index.json
index 961c388025..a881d908b7 100644
--- a/data/api/v2/meta/index.json
+++ b/data/api/v2/meta/index.json
@@ -1,5 +1,5 @@
 {
-    "deploy_date": "1780145370",
-    "hash": "ac1a701d95013c4464e11071b302645b18a32b5e",
+    "deploy_date": "1780295079",
+    "hash": "7248bece7564f5b3443741397eddb8d41f133b40",
     "tag": null
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-color/1/index.json b/data/api/v2/pokemon-color/1/index.json
index 550c9d0f40..5224ae24cf 100644
--- a/data/api/v2/pokemon-color/1/index.json
+++ b/data/api/v2/pokemon-color/1/index.json
@@ -170,10 +170,6 @@
             "name": "zebstrika",
             "url": "/api/v2/pokemon-species/523/"
         },
-        {
-            "name": "spewpa",
-            "url": "/api/v2/pokemon-species/665/"
-        },
         {
             "name": "sigilyph",
             "url": "/api/v2/pokemon-species/561/"
@@ -194,6 +190,10 @@
             "name": "scatterbug",
             "url": "/api/v2/pokemon-species/664/"
         },
+        {
+            "name": "spewpa",
+            "url": "/api/v2/pokemon-species/665/"
+        },
         {
             "name": "pikipek",
             "url": "/api/v2/pokemon-species/731/"
@@ -202,6 +202,14 @@
             "name": "salandit",
             "url": "/api/v2/pokemon-species/757/"
         },
+        {
+            "name": "trumbeak",
+            "url": "/api/v2/pokemon-species/732/"
+        },
+        {
+            "name": "toucannon",
+            "url": "/api/v2/pokemon-species/733/"
+        },
         {
             "name": "salazzle",
             "url": "/api/v2/pokemon-species/758/"
@@ -269,14 +277,6 @@
         {
             "name": "chandelure",
             "url": "/api/v2/pokemon-species/609/"
-        },
-        {
-            "name": "trumbeak",
-            "url": "/api/v2/pokemon-species/732/"
-        },
-        {
-            "name": "toucannon",
-            "url": "/api/v2/pokemon-species/733/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-color/10/index.json b/data/api/v2/pokemon-color/10/index.json
index 26044473c0..559aad9cd8 100644
--- a/data/api/v2/pokemon-color/10/index.json
+++ b/data/api/v2/pokemon-color/10/index.json
@@ -326,6 +326,10 @@
             "name": "heliolisk",
             "url": "/api/v2/pokemon-species/695/"
         },
+        {
+            "name": "ribombee",
+            "url": "/api/v2/pokemon-species/743/"
+        },
         {
             "name": "mimikyu",
             "url": "/api/v2/pokemon-species/778/"
@@ -342,6 +346,10 @@
             "name": "yamper",
             "url": "/api/v2/pokemon-species/835/"
         },
+        {
+            "name": "dottler",
+            "url": "/api/v2/pokemon-species/825/"
+        },
         {
             "name": "boltund",
             "url": "/api/v2/pokemon-species/836/"
@@ -414,17 +422,9 @@
             "name": "cofagrigus",
             "url": "/api/v2/pokemon-species/563/"
         },
-        {
-            "name": "ribombee",
-            "url": "/api/v2/pokemon-species/743/"
-        },
         {
             "name": "gholdengo",
             "url": "/api/v2/pokemon-species/1000/"
-        },
-        {
-            "name": "dottler",
-            "url": "/api/v2/pokemon-species/825/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-color/2/index.json b/data/api/v2/pokemon-color/2/index.json
index 4d32ad2bfb..8578b86b63 100644
--- a/data/api/v2/pokemon-color/2/index.json
+++ b/data/api/v2/pokemon-color/2/index.json
@@ -130,10 +130,6 @@
             "name": "tentacruel",
             "url": "/api/v2/pokemon-species/73/"
         },
-        {
-            "name": "greninja",
-            "url": "/api/v2/pokemon-species/658/"
-        },
         {
             "name": "tangela",
             "url": "/api/v2/pokemon-species/114/"
@@ -538,18 +534,10 @@
             "name": "cryogonal",
             "url": "/api/v2/pokemon-species/615/"
         },
-        {
-            "name": "frogadier",
-            "url": "/api/v2/pokemon-species/657/"
-        },
         {
             "name": "deino",
             "url": "/api/v2/pokemon-species/633/"
         },
-        {
-            "name": "meowstic",
-            "url": "/api/v2/pokemon-species/678/"
-        },
         {
             "name": "cobalion",
             "url": "/api/v2/pokemon-species/638/"
@@ -566,10 +554,26 @@
             "name": "inkay",
             "url": "/api/v2/pokemon-species/686/"
         },
+        {
+            "name": "zweilous",
+            "url": "/api/v2/pokemon-species/634/"
+        },
         {
             "name": "hydreigon",
             "url": "/api/v2/pokemon-species/635/"
         },
+        {
+            "name": "frogadier",
+            "url": "/api/v2/pokemon-species/657/"
+        },
+        {
+            "name": "greninja",
+            "url": "/api/v2/pokemon-species/658/"
+        },
+        {
+            "name": "meowstic",
+            "url": "/api/v2/pokemon-species/678/"
+        },
         {
             "name": "clauncher",
             "url": "/api/v2/pokemon-species/692/"
@@ -606,6 +610,18 @@
             "name": "aurorus",
             "url": "/api/v2/pokemon-species/699/"
         },
+        {
+            "name": "avalugg",
+            "url": "/api/v2/pokemon-species/713/"
+        },
+        {
+            "name": "primarina",
+            "url": "/api/v2/pokemon-species/730/"
+        },
+        {
+            "name": "vikavolt",
+            "url": "/api/v2/pokemon-species/738/"
+        },
         {
             "name": "toxapex",
             "url": "/api/v2/pokemon-species/748/"
@@ -630,6 +646,22 @@
             "name": "blipbug",
             "url": "/api/v2/pokemon-species/824/"
         },
+        {
+            "name": "cosmoem",
+            "url": "/api/v2/pokemon-species/790/"
+        },
+        {
+            "name": "drizzile",
+            "url": "/api/v2/pokemon-species/817/"
+        },
+        {
+            "name": "inteleon",
+            "url": "/api/v2/pokemon-species/818/"
+        },
+        {
+            "name": "corvisquire",
+            "url": "/api/v2/pokemon-species/822/"
+        },
         {
             "name": "cramorant",
             "url": "/api/v2/pokemon-species/845/"
@@ -714,45 +746,13 @@
             "name": "toxicroak",
             "url": "/api/v2/pokemon-species/454/"
         },
-        {
-            "name": "zweilous",
-            "url": "/api/v2/pokemon-species/634/"
-        },
         {
             "name": "malamar",
             "url": "/api/v2/pokemon-species/687/"
         },
-        {
-            "name": "avalugg",
-            "url": "/api/v2/pokemon-species/713/"
-        },
         {
             "name": "brionne",
             "url": "/api/v2/pokemon-species/729/"
-        },
-        {
-            "name": "primarina",
-            "url": "/api/v2/pokemon-species/730/"
-        },
-        {
-            "name": "vikavolt",
-            "url": "/api/v2/pokemon-species/738/"
-        },
-        {
-            "name": "cosmoem",
-            "url": "/api/v2/pokemon-species/790/"
-        },
-        {
-            "name": "drizzile",
-            "url": "/api/v2/pokemon-species/817/"
-        },
-        {
-            "name": "inteleon",
-            "url": "/api/v2/pokemon-species/818/"
-        },
-        {
-            "name": "corvisquire",
-            "url": "/api/v2/pokemon-species/822/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-color/3/index.json b/data/api/v2/pokemon-color/3/index.json
index 888a0f1785..5c6373a296 100644
--- a/data/api/v2/pokemon-color/3/index.json
+++ b/data/api/v2/pokemon-color/3/index.json
@@ -210,10 +210,6 @@
             "name": "dragonite",
             "url": "/api/v2/pokemon-species/149/"
         },
-        {
-            "name": "diggersby",
-            "url": "/api/v2/pokemon-species/660/"
-        },
         {
             "name": "sentret",
             "url": "/api/v2/pokemon-species/161/"
@@ -418,26 +414,14 @@
             "name": "stunfisk",
             "url": "/api/v2/pokemon-species/618/"
         },
-        {
-            "name": "pyroar",
-            "url": "/api/v2/pokemon-species/668/"
-        },
         {
             "name": "bouffalant",
             "url": "/api/v2/pokemon-species/626/"
         },
-        {
-            "name": "gogoat",
-            "url": "/api/v2/pokemon-species/673/"
-        },
         {
             "name": "vullaby",
             "url": "/api/v2/pokemon-species/629/"
         },
-        {
-            "name": "doublade",
-            "url": "/api/v2/pokemon-species/680/"
-        },
         {
             "name": "landorus",
             "url": "/api/v2/pokemon-species/645/"
@@ -462,6 +446,22 @@
             "name": "mandibuzz",
             "url": "/api/v2/pokemon-species/630/"
         },
+        {
+            "name": "diggersby",
+            "url": "/api/v2/pokemon-species/660/"
+        },
+        {
+            "name": "pyroar",
+            "url": "/api/v2/pokemon-species/668/"
+        },
+        {
+            "name": "gogoat",
+            "url": "/api/v2/pokemon-species/673/"
+        },
+        {
+            "name": "doublade",
+            "url": "/api/v2/pokemon-species/680/"
+        },
         {
             "name": "aegislash",
             "url": "/api/v2/pokemon-species/681/"
@@ -514,6 +514,30 @@
             "name": "dragalge",
             "url": "/api/v2/pokemon-species/691/"
         },
+        {
+            "name": "trevenant",
+            "url": "/api/v2/pokemon-species/709/"
+        },
+        {
+            "name": "gourgeist",
+            "url": "/api/v2/pokemon-species/711/"
+        },
+        {
+            "name": "dartrix",
+            "url": "/api/v2/pokemon-species/723/"
+        },
+        {
+            "name": "decidueye",
+            "url": "/api/v2/pokemon-species/724/"
+        },
+        {
+            "name": "gumshoos",
+            "url": "/api/v2/pokemon-species/735/"
+        },
+        {
+            "name": "lycanroc",
+            "url": "/api/v2/pokemon-species/745/"
+        },
         {
             "name": "mudsdale",
             "url": "/api/v2/pokemon-species/750/"
@@ -534,6 +558,14 @@
             "name": "nickit",
             "url": "/api/v2/pokemon-species/827/"
         },
+        {
+            "name": "greedent",
+            "url": "/api/v2/pokemon-species/820/"
+        },
+        {
+            "name": "thievul",
+            "url": "/api/v2/pokemon-species/828/"
+        },
         {
             "name": "arrokuda",
             "url": "/api/v2/pokemon-species/846/"
@@ -542,6 +574,10 @@
             "name": "clobbopus",
             "url": "/api/v2/pokemon-species/852/"
         },
+        {
+            "name": "barraskewda",
+            "url": "/api/v2/pokemon-species/847/"
+        },
         {
             "name": "perrserker",
             "url": "/api/v2/pokemon-species/863/"
@@ -550,10 +586,6 @@
             "name": "kleavor",
             "url": "/api/v2/pokemon-species/900/"
         },
-        {
-            "name": "ursaluna",
-            "url": "/api/v2/pokemon-species/901/"
-        },
         {
             "name": "nacli",
             "url": "/api/v2/pokemon-species/932/"
@@ -622,45 +654,13 @@
             "name": "mamoswine",
             "url": "/api/v2/pokemon-species/473/"
         },
-        {
-            "name": "trevenant",
-            "url": "/api/v2/pokemon-species/709/"
-        },
-        {
-            "name": "gourgeist",
-            "url": "/api/v2/pokemon-species/711/"
-        },
-        {
-            "name": "dartrix",
-            "url": "/api/v2/pokemon-species/723/"
-        },
-        {
-            "name": "decidueye",
-            "url": "/api/v2/pokemon-species/724/"
-        },
-        {
-            "name": "gumshoos",
-            "url": "/api/v2/pokemon-species/735/"
-        },
-        {
-            "name": "lycanroc",
-            "url": "/api/v2/pokemon-species/745/"
-        },
         {
             "name": "palossand",
             "url": "/api/v2/pokemon-species/770/"
         },
         {
-            "name": "greedent",
-            "url": "/api/v2/pokemon-species/820/"
-        },
-        {
-            "name": "thievul",
-            "url": "/api/v2/pokemon-species/828/"
-        },
-        {
-            "name": "barraskewda",
-            "url": "/api/v2/pokemon-species/847/"
+            "name": "ursaluna",
+            "url": "/api/v2/pokemon-species/901/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-color/4/index.json b/data/api/v2/pokemon-color/4/index.json
index fa2e3ea745..aecc38afad 100644
--- a/data/api/v2/pokemon-color/4/index.json
+++ b/data/api/v2/pokemon-color/4/index.json
@@ -362,6 +362,26 @@
             "name": "nymble",
             "url": "/api/v2/pokemon-species/919/"
         },
+        {
+            "name": "silvally",
+            "url": "/api/v2/pokemon-species/773/"
+        },
+        {
+            "name": "hakamo-o",
+            "url": "/api/v2/pokemon-species/783/"
+        },
+        {
+            "name": "kommo-o",
+            "url": "/api/v2/pokemon-species/784/"
+        },
+        {
+            "name": "melmetal",
+            "url": "/api/v2/pokemon-species/809/"
+        },
+        {
+            "name": "raboot",
+            "url": "/api/v2/pokemon-species/814/"
+        },
         {
             "name": "stonjourner",
             "url": "/api/v2/pokemon-species/874/"
@@ -378,6 +398,10 @@
             "name": "obstagoon",
             "url": "/api/v2/pokemon-species/862/"
         },
+        {
+            "name": "runerigus",
+            "url": "/api/v2/pokemon-species/867/"
+        },
         {
             "name": "urshifu",
             "url": "/api/v2/pokemon-species/892/"
@@ -462,34 +486,6 @@
             "name": "golisopod",
             "url": "/api/v2/pokemon-species/768/"
         },
-        {
-            "name": "silvally",
-            "url": "/api/v2/pokemon-species/773/"
-        },
-        {
-            "name": "hakamo-o",
-            "url": "/api/v2/pokemon-species/783/"
-        },
-        {
-            "name": "kommo-o",
-            "url": "/api/v2/pokemon-species/784/"
-        },
-        {
-            "name": "baxcalibur",
-            "url": "/api/v2/pokemon-species/998/"
-        },
-        {
-            "name": "melmetal",
-            "url": "/api/v2/pokemon-species/809/"
-        },
-        {
-            "name": "raboot",
-            "url": "/api/v2/pokemon-species/814/"
-        },
-        {
-            "name": "runerigus",
-            "url": "/api/v2/pokemon-species/867/"
-        },
         {
             "name": "lokix",
             "url": "/api/v2/pokemon-species/920/"
@@ -501,6 +497,10 @@
         {
             "name": "arctibax",
             "url": "/api/v2/pokemon-species/997/"
+        },
+        {
+            "name": "baxcalibur",
+            "url": "/api/v2/pokemon-species/998/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-color/5/index.json b/data/api/v2/pokemon-color/5/index.json
index f975321283..008eeb4c02 100644
--- a/data/api/v2/pokemon-color/5/index.json
+++ b/data/api/v2/pokemon-color/5/index.json
@@ -346,18 +346,10 @@
             "name": "reuniclus",
             "url": "/api/v2/pokemon-species/579/"
         },
-        {
-            "name": "quilladin",
-            "url": "/api/v2/pokemon-species/651/"
-        },
         {
             "name": "axew",
             "url": "/api/v2/pokemon-species/610/"
         },
-        {
-            "name": "chesnaught",
-            "url": "/api/v2/pokemon-species/652/"
-        },
         {
             "name": "golett",
             "url": "/api/v2/pokemon-species/622/"
@@ -382,6 +374,14 @@
             "name": "golurk",
             "url": "/api/v2/pokemon-species/623/"
         },
+        {
+            "name": "quilladin",
+            "url": "/api/v2/pokemon-species/651/"
+        },
+        {
+            "name": "chesnaught",
+            "url": "/api/v2/pokemon-species/652/"
+        },
         {
             "name": "hawlucha",
             "url": "/api/v2/pokemon-species/701/"
@@ -398,6 +398,10 @@
             "name": "comfey",
             "url": "/api/v2/pokemon-species/764/"
         },
+        {
+            "name": "charjabug",
+            "url": "/api/v2/pokemon-species/737/"
+        },
         {
             "name": "araquanid",
             "url": "/api/v2/pokemon-species/752/"
@@ -426,6 +430,18 @@
             "name": "applin",
             "url": "/api/v2/pokemon-species/840/"
         },
+        {
+            "name": "thwackey",
+            "url": "/api/v2/pokemon-species/811/"
+        },
+        {
+            "name": "rillaboom",
+            "url": "/api/v2/pokemon-species/812/"
+        },
+        {
+            "name": "eldegoss",
+            "url": "/api/v2/pokemon-species/830/"
+        },
         {
             "name": "drednaw",
             "url": "/api/v2/pokemon-species/834/"
@@ -466,6 +482,10 @@
             "name": "sprigatito",
             "url": "/api/v2/pokemon-species/906/"
         },
+        {
+            "name": "sandaconda",
+            "url": "/api/v2/pokemon-species/844/"
+        },
         {
             "name": "copperajah",
             "url": "/api/v2/pokemon-species/879/"
@@ -555,8 +575,12 @@
             "url": "/api/v2/pokemon-species/153/"
         },
         {
-            "name": "charjabug",
-            "url": "/api/v2/pokemon-species/737/"
+            "name": "appletun",
+            "url": "/api/v2/pokemon-species/842/"
+        },
+        {
+            "name": "arboliva",
+            "url": "/api/v2/pokemon-species/930/"
         },
         {
             "name": "dipplin",
@@ -569,30 +593,6 @@
         {
             "name": "hydrapple",
             "url": "/api/v2/pokemon-species/1019/"
-        },
-        {
-            "name": "thwackey",
-            "url": "/api/v2/pokemon-species/811/"
-        },
-        {
-            "name": "rillaboom",
-            "url": "/api/v2/pokemon-species/812/"
-        },
-        {
-            "name": "eldegoss",
-            "url": "/api/v2/pokemon-species/830/"
-        },
-        {
-            "name": "appletun",
-            "url": "/api/v2/pokemon-species/842/"
-        },
-        {
-            "name": "sandaconda",
-            "url": "/api/v2/pokemon-species/844/"
-        },
-        {
-            "name": "arboliva",
-            "url": "/api/v2/pokemon-species/930/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-color/6/index.json b/data/api/v2/pokemon-color/6/index.json
index 5bb93dc196..b39babc17c 100644
--- a/data/api/v2/pokemon-color/6/index.json
+++ b/data/api/v2/pokemon-color/6/index.json
@@ -242,6 +242,10 @@
             "name": "stufful",
             "url": "/api/v2/pokemon-species/759/"
         },
+        {
+            "name": "sylveon",
+            "url": "/api/v2/pokemon-species/700/"
+        },
         {
             "name": "lurantis",
             "url": "/api/v2/pokemon-species/754/"
@@ -309,10 +313,6 @@
         {
             "name": "tinkaton",
             "url": "/api/v2/pokemon-species/959/"
-        },
-        {
-            "name": "sylveon",
-            "url": "/api/v2/pokemon-species/700/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-color/7/index.json b/data/api/v2/pokemon-color/7/index.json
index af989db0c1..e088659a3d 100644
--- a/data/api/v2/pokemon-color/7/index.json
+++ b/data/api/v2/pokemon-color/7/index.json
@@ -318,6 +318,18 @@
             "name": "bounsweet",
             "url": "/api/v2/pokemon-species/761/"
         },
+        {
+            "name": "sliggoo",
+            "url": "/api/v2/pokemon-species/705/"
+        },
+        {
+            "name": "goodra",
+            "url": "/api/v2/pokemon-species/706/"
+        },
+        {
+            "name": "noivern",
+            "url": "/api/v2/pokemon-species/715/"
+        },
         {
             "name": "shiinotic",
             "url": "/api/v2/pokemon-species/756/"
@@ -326,10 +338,6 @@
             "name": "steenee",
             "url": "/api/v2/pokemon-species/762/"
         },
-        {
-            "name": "tsareena",
-            "url": "/api/v2/pokemon-species/763/"
-        },
         {
             "name": "tapu-fini",
             "url": "/api/v2/pokemon-species/788/"
@@ -338,6 +346,18 @@
             "name": "poipole",
             "url": "/api/v2/pokemon-species/803/"
         },
+        {
+            "name": "lunala",
+            "url": "/api/v2/pokemon-species/792/"
+        },
+        {
+            "name": "naganadel",
+            "url": "/api/v2/pokemon-species/804/"
+        },
+        {
+            "name": "corviknight",
+            "url": "/api/v2/pokemon-species/823/"
+        },
         {
             "name": "toxel",
             "url": "/api/v2/pokemon-species/848/"
@@ -366,10 +386,6 @@
             "name": "polteageist",
             "url": "/api/v2/pokemon-species/855/"
         },
-        {
-            "name": "grimmsnarl",
-            "url": "/api/v2/pokemon-species/861/"
-        },
         {
             "name": "mr-rime",
             "url": "/api/v2/pokemon-species/866/"
@@ -399,28 +415,12 @@
             "url": "/api/v2/pokemon-species/620/"
         },
         {
-            "name": "sliggoo",
-            "url": "/api/v2/pokemon-species/705/"
-        },
-        {
-            "name": "goodra",
-            "url": "/api/v2/pokemon-species/706/"
-        },
-        {
-            "name": "noivern",
-            "url": "/api/v2/pokemon-species/715/"
-        },
-        {
-            "name": "lunala",
-            "url": "/api/v2/pokemon-species/792/"
-        },
-        {
-            "name": "naganadel",
-            "url": "/api/v2/pokemon-species/804/"
+            "name": "tsareena",
+            "url": "/api/v2/pokemon-species/763/"
         },
         {
-            "name": "corviknight",
-            "url": "/api/v2/pokemon-species/823/"
+            "name": "grimmsnarl",
+            "url": "/api/v2/pokemon-species/861/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-color/8/index.json b/data/api/v2/pokemon-color/8/index.json
index 771fb2be5f..31e4246222 100644
--- a/data/api/v2/pokemon-color/8/index.json
+++ b/data/api/v2/pokemon-color/8/index.json
@@ -174,10 +174,6 @@
             "name": "octillery",
             "url": "/api/v2/pokemon-species/224/"
         },
-        {
-            "name": "fletchinder",
-            "url": "/api/v2/pokemon-species/662/"
-        },
         {
             "name": "magby",
             "url": "/api/v2/pokemon-species/240/"
@@ -206,10 +202,6 @@
             "name": "blaziken",
             "url": "/api/v2/pokemon-species/257/"
         },
-        {
-            "name": "talonflame",
-            "url": "/api/v2/pokemon-species/663/"
-        },
         {
             "name": "carvanha",
             "url": "/api/v2/pokemon-species/318/"
@@ -322,14 +314,6 @@
             "name": "scrafty",
             "url": "/api/v2/pokemon-species/560/"
         },
-        {
-            "name": "braixen",
-            "url": "/api/v2/pokemon-species/654/"
-        },
-        {
-            "name": "delphox",
-            "url": "/api/v2/pokemon-species/655/"
-        },
         {
             "name": "shelmet",
             "url": "/api/v2/pokemon-species/616/"
@@ -366,6 +350,22 @@
             "name": "braviary",
             "url": "/api/v2/pokemon-species/628/"
         },
+        {
+            "name": "braixen",
+            "url": "/api/v2/pokemon-species/654/"
+        },
+        {
+            "name": "delphox",
+            "url": "/api/v2/pokemon-species/655/"
+        },
+        {
+            "name": "fletchinder",
+            "url": "/api/v2/pokemon-species/662/"
+        },
+        {
+            "name": "talonflame",
+            "url": "/api/v2/pokemon-species/663/"
+        },
         {
             "name": "yveltal",
             "url": "/api/v2/pokemon-species/717/"
@@ -378,6 +378,14 @@
             "name": "oricorio",
             "url": "/api/v2/pokemon-species/741/"
         },
+        {
+            "name": "torracat",
+            "url": "/api/v2/pokemon-species/726/"
+        },
+        {
+            "name": "incineroar",
+            "url": "/api/v2/pokemon-species/727/"
+        },
         {
             "name": "turtonator",
             "url": "/api/v2/pokemon-species/776/"
@@ -450,14 +458,6 @@
             "name": "tyrantrum",
             "url": "/api/v2/pokemon-species/697/"
         },
-        {
-            "name": "torracat",
-            "url": "/api/v2/pokemon-species/726/"
-        },
-        {
-            "name": "incineroar",
-            "url": "/api/v2/pokemon-species/727/"
-        },
         {
             "name": "orbeetle",
             "url": "/api/v2/pokemon-species/826/"
diff --git a/data/api/v2/pokemon-color/9/index.json b/data/api/v2/pokemon-color/9/index.json
index 41d8545fc0..fa0875dc18 100644
--- a/data/api/v2/pokemon-color/9/index.json
+++ b/data/api/v2/pokemon-color/9/index.json
@@ -230,22 +230,10 @@
             "name": "cubchoo",
             "url": "/api/v2/pokemon-species/613/"
         },
-        {
-            "name": "floette",
-            "url": "/api/v2/pokemon-species/670/"
-        },
-        {
-            "name": "florges",
-            "url": "/api/v2/pokemon-species/671/"
-        },
         {
             "name": "rufflet",
             "url": "/api/v2/pokemon-species/627/"
         },
-        {
-            "name": "pangoro",
-            "url": "/api/v2/pokemon-species/675/"
-        },
         {
             "name": "larvesta",
             "url": "/api/v2/pokemon-species/636/"
@@ -282,10 +270,26 @@
             "name": "volcarona",
             "url": "/api/v2/pokemon-species/637/"
         },
+        {
+            "name": "floette",
+            "url": "/api/v2/pokemon-species/670/"
+        },
+        {
+            "name": "florges",
+            "url": "/api/v2/pokemon-species/671/"
+        },
+        {
+            "name": "pangoro",
+            "url": "/api/v2/pokemon-species/675/"
+        },
         {
             "name": "slurpuff",
             "url": "/api/v2/pokemon-species/685/"
         },
+        {
+            "name": "crabominable",
+            "url": "/api/v2/pokemon-species/740/"
+        },
         {
             "name": "oranguru",
             "url": "/api/v2/pokemon-species/765/"
@@ -322,6 +326,18 @@
             "name": "wooloo",
             "url": "/api/v2/pokemon-species/831/"
         },
+        {
+            "name": "solgaleo",
+            "url": "/api/v2/pokemon-species/791/"
+        },
+        {
+            "name": "cinderace",
+            "url": "/api/v2/pokemon-species/815/"
+        },
+        {
+            "name": "dubwool",
+            "url": "/api/v2/pokemon-species/832/"
+        },
         {
             "name": "milcery",
             "url": "/api/v2/pokemon-species/868/"
@@ -406,22 +422,6 @@
             "name": "vivillon",
             "url": "/api/v2/pokemon-species/666/"
         },
-        {
-            "name": "crabominable",
-            "url": "/api/v2/pokemon-species/740/"
-        },
-        {
-            "name": "solgaleo",
-            "url": "/api/v2/pokemon-species/791/"
-        },
-        {
-            "name": "cinderace",
-            "url": "/api/v2/pokemon-species/815/"
-        },
-        {
-            "name": "dubwool",
-            "url": "/api/v2/pokemon-species/832/"
-        },
         {
             "name": "archaludon",
             "url": "/api/v2/pokemon-species/1018/"
diff --git a/data/api/v2/pokemon-shape/1/index.json b/data/api/v2/pokemon-shape/1/index.json
index e63e5abb2c..7ed039650f 100644
--- a/data/api/v2/pokemon-shape/1/index.json
+++ b/data/api/v2/pokemon-shape/1/index.json
@@ -186,6 +186,10 @@
             "name": "rolycoly",
             "url": "/api/v2/pokemon-species/837/"
         },
+        {
+            "name": "cosmoem",
+            "url": "/api/v2/pokemon-species/790/"
+        },
         {
             "name": "sinistea",
             "url": "/api/v2/pokemon-species/854/"
@@ -230,10 +234,6 @@
             "name": "pecharunt",
             "url": "/api/v2/pokemon-species/1025/"
         },
-        {
-            "name": "cosmoem",
-            "url": "/api/v2/pokemon-species/790/"
-        },
         {
             "name": "sinistcha",
             "url": "/api/v2/pokemon-species/1013/"
diff --git a/data/api/v2/pokemon-shape/10/index.json b/data/api/v2/pokemon-shape/10/index.json
index 2e390e2256..2325dabaa1 100644
--- a/data/api/v2/pokemon-shape/10/index.json
+++ b/data/api/v2/pokemon-shape/10/index.json
@@ -86,6 +86,10 @@
             "name": "inkay",
             "url": "/api/v2/pokemon-species/686/"
         },
+        {
+            "name": "trevenant",
+            "url": "/api/v2/pokemon-species/709/"
+        },
         {
             "name": "toxapex",
             "url": "/api/v2/pokemon-species/748/"
@@ -125,10 +129,6 @@
         {
             "name": "toedscruel",
             "url": "/api/v2/pokemon-species/949/"
-        },
-        {
-            "name": "trevenant",
-            "url": "/api/v2/pokemon-species/709/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-shape/12/index.json b/data/api/v2/pokemon-shape/12/index.json
index 02160bdd1b..5ed1baeddd 100644
--- a/data/api/v2/pokemon-shape/12/index.json
+++ b/data/api/v2/pokemon-shape/12/index.json
@@ -82,10 +82,6 @@
             "name": "graveler",
             "url": "/api/v2/pokemon-species/75/"
         },
-        {
-            "name": "greninja",
-            "url": "/api/v2/pokemon-species/658/"
-        },
         {
             "name": "drowzee",
             "url": "/api/v2/pokemon-species/96/"
@@ -418,10 +414,6 @@
             "name": "beheeyem",
             "url": "/api/v2/pokemon-species/606/"
         },
-        {
-            "name": "frogadier",
-            "url": "/api/v2/pokemon-species/657/"
-        },
         {
             "name": "golett",
             "url": "/api/v2/pokemon-species/622/"
@@ -430,10 +422,6 @@
             "name": "pawniard",
             "url": "/api/v2/pokemon-species/624/"
         },
-        {
-            "name": "pangoro",
-            "url": "/api/v2/pokemon-species/675/"
-        },
         {
             "name": "meloetta",
             "url": "/api/v2/pokemon-species/648/"
@@ -450,6 +438,18 @@
             "name": "bisharp",
             "url": "/api/v2/pokemon-species/625/"
         },
+        {
+            "name": "frogadier",
+            "url": "/api/v2/pokemon-species/657/"
+        },
+        {
+            "name": "greninja",
+            "url": "/api/v2/pokemon-species/658/"
+        },
+        {
+            "name": "pangoro",
+            "url": "/api/v2/pokemon-species/675/"
+        },
         {
             "name": "aromatisse",
             "url": "/api/v2/pokemon-species/683/"
@@ -474,10 +474,6 @@
             "name": "steenee",
             "url": "/api/v2/pokemon-species/762/"
         },
-        {
-            "name": "tsareena",
-            "url": "/api/v2/pokemon-species/763/"
-        },
         {
             "name": "oranguru",
             "url": "/api/v2/pokemon-species/765/"
@@ -514,6 +510,14 @@
             "name": "zeraora",
             "url": "/api/v2/pokemon-species/807/"
         },
+        {
+            "name": "melmetal",
+            "url": "/api/v2/pokemon-species/809/"
+        },
+        {
+            "name": "rillaboom",
+            "url": "/api/v2/pokemon-species/812/"
+        },
         {
             "name": "coalossal",
             "url": "/api/v2/pokemon-species/839/"
@@ -546,10 +550,6 @@
             "name": "morgrem",
             "url": "/api/v2/pokemon-species/860/"
         },
-        {
-            "name": "grimmsnarl",
-            "url": "/api/v2/pokemon-species/861/"
-        },
         {
             "name": "mr-rime",
             "url": "/api/v2/pokemon-species/866/"
@@ -631,20 +631,16 @@
             "url": "/api/v2/pokemon-species/533/"
         },
         {
-            "name": "golisopod",
-            "url": "/api/v2/pokemon-species/768/"
-        },
-        {
-            "name": "gholdengo",
-            "url": "/api/v2/pokemon-species/1000/"
+            "name": "tsareena",
+            "url": "/api/v2/pokemon-species/763/"
         },
         {
-            "name": "melmetal",
-            "url": "/api/v2/pokemon-species/809/"
+            "name": "golisopod",
+            "url": "/api/v2/pokemon-species/768/"
         },
         {
-            "name": "rillaboom",
-            "url": "/api/v2/pokemon-species/812/"
+            "name": "grimmsnarl",
+            "url": "/api/v2/pokemon-species/861/"
         },
         {
             "name": "lokix",
@@ -653,6 +649,10 @@
         {
             "name": "arboliva",
             "url": "/api/v2/pokemon-species/930/"
+        },
+        {
+            "name": "gholdengo",
+            "url": "/api/v2/pokemon-species/1000/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-shape/13/index.json b/data/api/v2/pokemon-shape/13/index.json
index 9df5ba1d32..612835cae3 100644
--- a/data/api/v2/pokemon-shape/13/index.json
+++ b/data/api/v2/pokemon-shape/13/index.json
@@ -102,6 +102,10 @@
             "name": "volcarona",
             "url": "/api/v2/pokemon-species/637/"
         },
+        {
+            "name": "ribombee",
+            "url": "/api/v2/pokemon-species/743/"
+        },
         {
             "name": "frosmoth",
             "url": "/api/v2/pokemon-species/873/"
@@ -117,10 +121,6 @@
         {
             "name": "vivillon",
             "url": "/api/v2/pokemon-species/666/"
-        },
-        {
-            "name": "ribombee",
-            "url": "/api/v2/pokemon-species/743/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-shape/14/index.json b/data/api/v2/pokemon-shape/14/index.json
index 60f82563b3..a1501ceea3 100644
--- a/data/api/v2/pokemon-shape/14/index.json
+++ b/data/api/v2/pokemon-shape/14/index.json
@@ -174,6 +174,14 @@
             "name": "cutiefly",
             "url": "/api/v2/pokemon-species/742/"
         },
+        {
+            "name": "vikavolt",
+            "url": "/api/v2/pokemon-species/738/"
+        },
+        {
+            "name": "crabominable",
+            "url": "/api/v2/pokemon-species/740/"
+        },
         {
             "name": "araquanid",
             "url": "/api/v2/pokemon-species/752/"
@@ -186,6 +194,10 @@
             "name": "nymble",
             "url": "/api/v2/pokemon-species/919/"
         },
+        {
+            "name": "dottler",
+            "url": "/api/v2/pokemon-species/825/"
+        },
         {
             "name": "tarountula",
             "url": "/api/v2/pokemon-species/917/"
@@ -205,18 +217,6 @@
         {
             "name": "rabsca",
             "url": "/api/v2/pokemon-species/954/"
-        },
-        {
-            "name": "vikavolt",
-            "url": "/api/v2/pokemon-species/738/"
-        },
-        {
-            "name": "crabominable",
-            "url": "/api/v2/pokemon-species/740/"
-        },
-        {
-            "name": "dottler",
-            "url": "/api/v2/pokemon-species/825/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-shape/2/index.json b/data/api/v2/pokemon-shape/2/index.json
index ee03f13e7c..91d96d0982 100644
--- a/data/api/v2/pokemon-shape/2/index.json
+++ b/data/api/v2/pokemon-shape/2/index.json
@@ -130,6 +130,14 @@
             "name": "clawitzer",
             "url": "/api/v2/pokemon-species/693/"
         },
+        {
+            "name": "sliggoo",
+            "url": "/api/v2/pokemon-species/705/"
+        },
+        {
+            "name": "charjabug",
+            "url": "/api/v2/pokemon-species/737/"
+        },
         {
             "name": "sandygast",
             "url": "/api/v2/pokemon-species/769/"
@@ -162,6 +170,10 @@
             "name": "dreepy",
             "url": "/api/v2/pokemon-species/885/"
         },
+        {
+            "name": "sandaconda",
+            "url": "/api/v2/pokemon-species/844/"
+        },
         {
             "name": "orthworm",
             "url": "/api/v2/pokemon-species/968/"
@@ -178,21 +190,9 @@
             "name": "gastrodon",
             "url": "/api/v2/pokemon-species/423/"
         },
-        {
-            "name": "sliggoo",
-            "url": "/api/v2/pokemon-species/705/"
-        },
-        {
-            "name": "charjabug",
-            "url": "/api/v2/pokemon-species/737/"
-        },
         {
             "name": "palossand",
             "url": "/api/v2/pokemon-species/770/"
-        },
-        {
-            "name": "sandaconda",
-            "url": "/api/v2/pokemon-species/844/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-shape/3/index.json b/data/api/v2/pokemon-shape/3/index.json
index 18fee7918a..79df0cc7e4 100644
--- a/data/api/v2/pokemon-shape/3/index.json
+++ b/data/api/v2/pokemon-shape/3/index.json
@@ -166,6 +166,10 @@
             "name": "wishiwashi",
             "url": "/api/v2/pokemon-species/746/"
         },
+        {
+            "name": "primarina",
+            "url": "/api/v2/pokemon-species/730/"
+        },
         {
             "name": "bruxish",
             "url": "/api/v2/pokemon-species/779/"
@@ -178,6 +182,10 @@
             "name": "arctovish",
             "url": "/api/v2/pokemon-species/883/"
         },
+        {
+            "name": "barraskewda",
+            "url": "/api/v2/pokemon-species/847/"
+        },
         {
             "name": "basculegion",
             "url": "/api/v2/pokemon-species/902/"
@@ -213,14 +221,6 @@
         {
             "name": "brionne",
             "url": "/api/v2/pokemon-species/729/"
-        },
-        {
-            "name": "primarina",
-            "url": "/api/v2/pokemon-species/730/"
-        },
-        {
-            "name": "barraskewda",
-            "url": "/api/v2/pokemon-species/847/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-shape/4/index.json b/data/api/v2/pokemon-shape/4/index.json
index 73a1abcad1..15e2a9c8cc 100644
--- a/data/api/v2/pokemon-shape/4/index.json
+++ b/data/api/v2/pokemon-shape/4/index.json
@@ -146,14 +146,6 @@
             "name": "lampent",
             "url": "/api/v2/pokemon-species/608/"
         },
-        {
-            "name": "floette",
-            "url": "/api/v2/pokemon-species/670/"
-        },
-        {
-            "name": "florges",
-            "url": "/api/v2/pokemon-species/671/"
-        },
         {
             "name": "tornadus",
             "url": "/api/v2/pokemon-species/641/"
@@ -178,6 +170,14 @@
             "name": "accelgor",
             "url": "/api/v2/pokemon-species/617/"
         },
+        {
+            "name": "floette",
+            "url": "/api/v2/pokemon-species/670/"
+        },
+        {
+            "name": "florges",
+            "url": "/api/v2/pokemon-species/671/"
+        },
         {
             "name": "phantump",
             "url": "/api/v2/pokemon-species/708/"
diff --git a/data/api/v2/pokemon-shape/5/index.json b/data/api/v2/pokemon-shape/5/index.json
index dfdd20033e..951e49d862 100644
--- a/data/api/v2/pokemon-shape/5/index.json
+++ b/data/api/v2/pokemon-shape/5/index.json
@@ -98,10 +98,6 @@
             "name": "wormadam",
             "url": "/api/v2/pokemon-species/413/"
         },
-        {
-            "name": "spewpa",
-            "url": "/api/v2/pokemon-species/665/"
-        },
         {
             "name": "petilil",
             "url": "/api/v2/pokemon-species/548/"
@@ -130,6 +126,10 @@
             "name": "honedge",
             "url": "/api/v2/pokemon-species/679/"
         },
+        {
+            "name": "spewpa",
+            "url": "/api/v2/pokemon-species/665/"
+        },
         {
             "name": "aegislash",
             "url": "/api/v2/pokemon-species/681/"
@@ -150,6 +150,10 @@
             "name": "dragalge",
             "url": "/api/v2/pokemon-species/691/"
         },
+        {
+            "name": "gourgeist",
+            "url": "/api/v2/pokemon-species/711/"
+        },
         {
             "name": "dhelmise",
             "url": "/api/v2/pokemon-species/781/"
@@ -158,10 +162,18 @@
             "name": "gossifleur",
             "url": "/api/v2/pokemon-species/829/"
         },
+        {
+            "name": "eldegoss",
+            "url": "/api/v2/pokemon-species/830/"
+        },
         {
             "name": "hatterene",
             "url": "/api/v2/pokemon-species/858/"
         },
+        {
+            "name": "runerigus",
+            "url": "/api/v2/pokemon-species/867/"
+        },
         {
             "name": "alcremie",
             "url": "/api/v2/pokemon-species/869/"
@@ -185,18 +197,6 @@
         {
             "name": "malamar",
             "url": "/api/v2/pokemon-species/687/"
-        },
-        {
-            "name": "gourgeist",
-            "url": "/api/v2/pokemon-species/711/"
-        },
-        {
-            "name": "eldegoss",
-            "url": "/api/v2/pokemon-species/830/"
-        },
-        {
-            "name": "runerigus",
-            "url": "/api/v2/pokemon-species/867/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-shape/6/index.json b/data/api/v2/pokemon-shape/6/index.json
index ff26f1d583..64ff0d438d 100644
--- a/data/api/v2/pokemon-shape/6/index.json
+++ b/data/api/v2/pokemon-shape/6/index.json
@@ -170,10 +170,6 @@
             "name": "mew",
             "url": "/api/v2/pokemon-species/151/"
         },
-        {
-            "name": "diggersby",
-            "url": "/api/v2/pokemon-species/660/"
-        },
         {
             "name": "totodile",
             "url": "/api/v2/pokemon-species/158/"
@@ -554,30 +550,14 @@
             "name": "zoroark",
             "url": "/api/v2/pokemon-species/571/"
         },
-        {
-            "name": "quilladin",
-            "url": "/api/v2/pokemon-species/651/"
-        },
         {
             "name": "axew",
             "url": "/api/v2/pokemon-species/610/"
         },
-        {
-            "name": "chesnaught",
-            "url": "/api/v2/pokemon-species/652/"
-        },
-        {
-            "name": "braixen",
-            "url": "/api/v2/pokemon-species/654/"
-        },
         {
             "name": "cubchoo",
             "url": "/api/v2/pokemon-species/613/"
         },
-        {
-            "name": "delphox",
-            "url": "/api/v2/pokemon-species/655/"
-        },
         {
             "name": "mienfoo",
             "url": "/api/v2/pokemon-species/619/"
@@ -590,10 +570,6 @@
             "name": "heatmor",
             "url": "/api/v2/pokemon-species/631/"
         },
-        {
-            "name": "meowstic",
-            "url": "/api/v2/pokemon-species/678/"
-        },
         {
             "name": "zekrom",
             "url": "/api/v2/pokemon-species/644/"
@@ -630,6 +606,30 @@
             "name": "hydreigon",
             "url": "/api/v2/pokemon-species/635/"
         },
+        {
+            "name": "quilladin",
+            "url": "/api/v2/pokemon-species/651/"
+        },
+        {
+            "name": "chesnaught",
+            "url": "/api/v2/pokemon-species/652/"
+        },
+        {
+            "name": "braixen",
+            "url": "/api/v2/pokemon-species/654/"
+        },
+        {
+            "name": "delphox",
+            "url": "/api/v2/pokemon-species/655/"
+        },
+        {
+            "name": "diggersby",
+            "url": "/api/v2/pokemon-species/660/"
+        },
+        {
+            "name": "meowstic",
+            "url": "/api/v2/pokemon-species/678/"
+        },
         {
             "name": "helioptile",
             "url": "/api/v2/pokemon-species/694/"
@@ -650,6 +650,14 @@
             "name": "heliolisk",
             "url": "/api/v2/pokemon-species/695/"
         },
+        {
+            "name": "goodra",
+            "url": "/api/v2/pokemon-species/706/"
+        },
+        {
+            "name": "incineroar",
+            "url": "/api/v2/pokemon-species/727/"
+        },
         {
             "name": "bewear",
             "url": "/api/v2/pokemon-species/760/"
@@ -690,6 +698,38 @@
             "name": "skwovet",
             "url": "/api/v2/pokemon-species/819/"
         },
+        {
+            "name": "hakamo-o",
+            "url": "/api/v2/pokemon-species/783/"
+        },
+        {
+            "name": "kommo-o",
+            "url": "/api/v2/pokemon-species/784/"
+        },
+        {
+            "name": "thwackey",
+            "url": "/api/v2/pokemon-species/811/"
+        },
+        {
+            "name": "raboot",
+            "url": "/api/v2/pokemon-species/814/"
+        },
+        {
+            "name": "cinderace",
+            "url": "/api/v2/pokemon-species/815/"
+        },
+        {
+            "name": "drizzile",
+            "url": "/api/v2/pokemon-species/817/"
+        },
+        {
+            "name": "inteleon",
+            "url": "/api/v2/pokemon-species/818/"
+        },
+        {
+            "name": "greedent",
+            "url": "/api/v2/pokemon-species/820/"
+        },
         {
             "name": "toxel",
             "url": "/api/v2/pokemon-species/848/"
@@ -847,53 +887,13 @@
             "url": "/api/v2/pokemon-species/697/"
         },
         {
-            "name": "goodra",
-            "url": "/api/v2/pokemon-species/706/"
-        },
-        {
-            "name": "incineroar",
-            "url": "/api/v2/pokemon-species/727/"
-        },
-        {
-            "name": "hakamo-o",
-            "url": "/api/v2/pokemon-species/783/"
-        },
-        {
-            "name": "kommo-o",
-            "url": "/api/v2/pokemon-species/784/"
+            "name": "arctibax",
+            "url": "/api/v2/pokemon-species/997/"
         },
         {
             "name": "baxcalibur",
             "url": "/api/v2/pokemon-species/998/"
         },
-        {
-            "name": "thwackey",
-            "url": "/api/v2/pokemon-species/811/"
-        },
-        {
-            "name": "raboot",
-            "url": "/api/v2/pokemon-species/814/"
-        },
-        {
-            "name": "cinderace",
-            "url": "/api/v2/pokemon-species/815/"
-        },
-        {
-            "name": "drizzile",
-            "url": "/api/v2/pokemon-species/817/"
-        },
-        {
-            "name": "inteleon",
-            "url": "/api/v2/pokemon-species/818/"
-        },
-        {
-            "name": "greedent",
-            "url": "/api/v2/pokemon-species/820/"
-        },
-        {
-            "name": "arctibax",
-            "url": "/api/v2/pokemon-species/997/"
-        },
         {
             "name": "archaludon",
             "url": "/api/v2/pokemon-species/1018/"
diff --git a/data/api/v2/pokemon-shape/8/index.json b/data/api/v2/pokemon-shape/8/index.json
index 1fcaf7709d..6c716f930d 100644
--- a/data/api/v2/pokemon-shape/8/index.json
+++ b/data/api/v2/pokemon-shape/8/index.json
@@ -466,18 +466,10 @@
             "name": "sawsbuck",
             "url": "/api/v2/pokemon-species/586/"
         },
-        {
-            "name": "pyroar",
-            "url": "/api/v2/pokemon-species/668/"
-        },
         {
             "name": "bouffalant",
             "url": "/api/v2/pokemon-species/626/"
         },
-        {
-            "name": "gogoat",
-            "url": "/api/v2/pokemon-species/673/"
-        },
         {
             "name": "deino",
             "url": "/api/v2/pokemon-species/633/"
@@ -522,6 +514,18 @@
             "name": "beartic",
             "url": "/api/v2/pokemon-species/614/"
         },
+        {
+            "name": "zweilous",
+            "url": "/api/v2/pokemon-species/634/"
+        },
+        {
+            "name": "pyroar",
+            "url": "/api/v2/pokemon-species/668/"
+        },
+        {
+            "name": "gogoat",
+            "url": "/api/v2/pokemon-species/673/"
+        },
         {
             "name": "amaura",
             "url": "/api/v2/pokemon-species/698/"
@@ -566,6 +570,26 @@
             "name": "aurorus",
             "url": "/api/v2/pokemon-species/699/"
         },
+        {
+            "name": "sylveon",
+            "url": "/api/v2/pokemon-species/700/"
+        },
+        {
+            "name": "avalugg",
+            "url": "/api/v2/pokemon-species/713/"
+        },
+        {
+            "name": "torracat",
+            "url": "/api/v2/pokemon-species/726/"
+        },
+        {
+            "name": "gumshoos",
+            "url": "/api/v2/pokemon-species/735/"
+        },
+        {
+            "name": "lycanroc",
+            "url": "/api/v2/pokemon-species/745/"
+        },
         {
             "name": "mudsdale",
             "url": "/api/v2/pokemon-species/750/"
@@ -606,6 +630,22 @@
             "name": "yamper",
             "url": "/api/v2/pokemon-species/835/"
         },
+        {
+            "name": "silvally",
+            "url": "/api/v2/pokemon-species/773/"
+        },
+        {
+            "name": "solgaleo",
+            "url": "/api/v2/pokemon-species/791/"
+        },
+        {
+            "name": "thievul",
+            "url": "/api/v2/pokemon-species/828/"
+        },
+        {
+            "name": "dubwool",
+            "url": "/api/v2/pokemon-species/832/"
+        },
         {
             "name": "drednaw",
             "url": "/api/v2/pokemon-species/834/"
@@ -650,10 +690,6 @@
             "name": "wyrdeer",
             "url": "/api/v2/pokemon-species/899/"
         },
-        {
-            "name": "ursaluna",
-            "url": "/api/v2/pokemon-species/901/"
-        },
         {
             "name": "skeledirge",
             "url": "/api/v2/pokemon-species/911/"
@@ -790,49 +826,13 @@
             "name": "herdier",
             "url": "/api/v2/pokemon-species/507/"
         },
-        {
-            "name": "zweilous",
-            "url": "/api/v2/pokemon-species/634/"
-        },
-        {
-            "name": "sylveon",
-            "url": "/api/v2/pokemon-species/700/"
-        },
-        {
-            "name": "avalugg",
-            "url": "/api/v2/pokemon-species/713/"
-        },
-        {
-            "name": "torracat",
-            "url": "/api/v2/pokemon-species/726/"
-        },
-        {
-            "name": "gumshoos",
-            "url": "/api/v2/pokemon-species/735/"
-        },
-        {
-            "name": "lycanroc",
-            "url": "/api/v2/pokemon-species/745/"
-        },
-        {
-            "name": "silvally",
-            "url": "/api/v2/pokemon-species/773/"
-        },
-        {
-            "name": "solgaleo",
-            "url": "/api/v2/pokemon-species/791/"
-        },
-        {
-            "name": "thievul",
-            "url": "/api/v2/pokemon-species/828/"
-        },
-        {
-            "name": "dubwool",
-            "url": "/api/v2/pokemon-species/832/"
-        },
         {
             "name": "appletun",
             "url": "/api/v2/pokemon-species/842/"
+        },
+        {
+            "name": "ursaluna",
+            "url": "/api/v2/pokemon-species/901/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-shape/9/index.json b/data/api/v2/pokemon-shape/9/index.json
index 87e2bc3fdb..0a920dac4f 100644
--- a/data/api/v2/pokemon-shape/9/index.json
+++ b/data/api/v2/pokemon-shape/9/index.json
@@ -118,10 +118,6 @@
             "name": "xatu",
             "url": "/api/v2/pokemon-species/178/"
         },
-        {
-            "name": "fletchinder",
-            "url": "/api/v2/pokemon-species/662/"
-        },
         {
             "name": "skarmory",
             "url": "/api/v2/pokemon-species/227/"
@@ -150,10 +146,6 @@
             "name": "pelipper",
             "url": "/api/v2/pokemon-species/279/"
         },
-        {
-            "name": "talonflame",
-            "url": "/api/v2/pokemon-species/663/"
-        },
         {
             "name": "swablu",
             "url": "/api/v2/pokemon-species/333/"
@@ -270,6 +262,14 @@
             "name": "mandibuzz",
             "url": "/api/v2/pokemon-species/630/"
         },
+        {
+            "name": "fletchinder",
+            "url": "/api/v2/pokemon-species/662/"
+        },
+        {
+            "name": "talonflame",
+            "url": "/api/v2/pokemon-species/663/"
+        },
         {
             "name": "noibat",
             "url": "/api/v2/pokemon-species/714/"
@@ -290,10 +290,46 @@
             "name": "oricorio",
             "url": "/api/v2/pokemon-species/741/"
         },
+        {
+            "name": "noivern",
+            "url": "/api/v2/pokemon-species/715/"
+        },
+        {
+            "name": "dartrix",
+            "url": "/api/v2/pokemon-species/723/"
+        },
+        {
+            "name": "decidueye",
+            "url": "/api/v2/pokemon-species/724/"
+        },
+        {
+            "name": "trumbeak",
+            "url": "/api/v2/pokemon-species/732/"
+        },
+        {
+            "name": "toucannon",
+            "url": "/api/v2/pokemon-species/733/"
+        },
         {
             "name": "rookidee",
             "url": "/api/v2/pokemon-species/821/"
         },
+        {
+            "name": "lunala",
+            "url": "/api/v2/pokemon-species/792/"
+        },
+        {
+            "name": "naganadel",
+            "url": "/api/v2/pokemon-species/804/"
+        },
+        {
+            "name": "corvisquire",
+            "url": "/api/v2/pokemon-species/822/"
+        },
+        {
+            "name": "corviknight",
+            "url": "/api/v2/pokemon-species/823/"
+        },
         {
             "name": "flapple",
             "url": "/api/v2/pokemon-species/841/"
@@ -342,42 +378,6 @@
             "name": "mantine",
             "url": "/api/v2/pokemon-species/226/"
         },
-        {
-            "name": "noivern",
-            "url": "/api/v2/pokemon-species/715/"
-        },
-        {
-            "name": "dartrix",
-            "url": "/api/v2/pokemon-species/723/"
-        },
-        {
-            "name": "decidueye",
-            "url": "/api/v2/pokemon-species/724/"
-        },
-        {
-            "name": "trumbeak",
-            "url": "/api/v2/pokemon-species/732/"
-        },
-        {
-            "name": "toucannon",
-            "url": "/api/v2/pokemon-species/733/"
-        },
-        {
-            "name": "lunala",
-            "url": "/api/v2/pokemon-species/792/"
-        },
-        {
-            "name": "naganadel",
-            "url": "/api/v2/pokemon-species/804/"
-        },
-        {
-            "name": "corvisquire",
-            "url": "/api/v2/pokemon-species/822/"
-        },
-        {
-            "name": "corviknight",
-            "url": "/api/v2/pokemon-species/823/"
-        },
         {
             "name": "orbeetle",
             "url": "/api/v2/pokemon-species/826/"
diff --git a/data/api/v2/pokemon/137/index.json b/data/api/v2/pokemon/137/index.json
index bfb54dd072..0d7c138ea1 100644
--- a/data/api/v2/pokemon/137/index.json
+++ b/data/api/v2/pokemon/137/index.json
@@ -474,18 +474,6 @@
                         "url": "/api/v2/version-group/24/"
                     }
                 },
-                {
-                    "level_learned_at": 1,
-                    "move_learn_method": {
-                        "name": "level-up",
-                        "url": "/api/v2/move-learn-method/1/"
-                    },
-                    "order": null,
-                    "version_group": {
-                        "name": "legends-arceus",
-                        "url": "/api/v2/version-group/24/"
-                    }
-                },
                 {
                     "level_learned_at": 1,
                     "move_learn_method": {
@@ -1878,18 +1866,6 @@
                         "url": "/api/v2/version-group/24/"
                     }
                 },
-                {
-                    "level_learned_at": 47,
-                    "move_learn_method": {
-                        "name": "level-up",
-                        "url": "/api/v2/move-learn-method/1/"
-                    },
-                    "order": null,
-                    "version_group": {
-                        "name": "legends-arceus",
-                        "url": "/api/v2/version-group/24/"
-                    }
-                },
                 {
                     "level_learned_at": 0,
                     "move_learn_method": {
@@ -2194,18 +2170,6 @@
                         "url": "/api/v2/version-group/24/"
                     }
                 },
-                {
-                    "level_learned_at": 5,
-                    "move_learn_method": {
-                        "name": "level-up",
-                        "url": "/api/v2/move-learn-method/1/"
-                    },
-                    "order": null,
-                    "version_group": {
-                        "name": "legends-arceus",
-                        "url": "/api/v2/version-group/24/"
-                    }
-                },
                 {
                     "level_learned_at": 15,
                     "move_learn_method": {
@@ -2478,18 +2442,6 @@
                         "url": "/api/v2/version-group/24/"
                     }
                 },
-                {
-                    "level_learned_at": 29,
-                    "move_learn_method": {
-                        "name": "level-up",
-                        "url": "/api/v2/move-learn-method/1/"
-                    },
-                    "order": null,
-                    "version_group": {
-                        "name": "legends-arceus",
-                        "url": "/api/v2/version-group/24/"
-                    }
-                },
                 {
                     "level_learned_at": 0,
                     "move_learn_method": {
@@ -2762,18 +2714,6 @@
                         "url": "/api/v2/version-group/24/"
                     }
                 },
-                {
-                    "level_learned_at": 9,
-                    "move_learn_method": {
-                        "name": "level-up",
-                        "url": "/api/v2/move-learn-method/1/"
-                    },
-                    "order": null,
-                    "version_group": {
-                        "name": "legends-arceus",
-                        "url": "/api/v2/version-group/24/"
-                    }
-                },
                 {
                     "level_learned_at": 0,
                     "move_learn_method": {
@@ -4730,18 +4670,6 @@
                         "url": "/api/v2/version-group/24/"
                     }
                 },
-                {
-                    "level_learned_at": 37,
-                    "move_learn_method": {
-                        "name": "level-up",
-                        "url": "/api/v2/move-learn-method/1/"
-                    },
-                    "order": null,
-                    "version_group": {
-                        "name": "legends-arceus",
-                        "url": "/api/v2/version-group/24/"
-                    }
-                },
                 {
                     "level_learned_at": 35,
                     "move_learn_method": {
@@ -6782,18 +6710,6 @@
                         "url": "/api/v2/version-group/24/"
                     }
                 },
-                {
-                    "level_learned_at": 21,
-                    "move_learn_method": {
-                        "name": "level-up",
-                        "url": "/api/v2/move-learn-method/1/"
-                    },
-                    "order": null,
-                    "version_group": {
-                        "name": "legends-arceus",
-                        "url": "/api/v2/version-group/24/"
-                    }
-                },
                 {
                     "level_learned_at": 45,
                     "move_learn_method": {
@@ -8950,18 +8866,6 @@
                 "url": "/api/v2/move/209/"
             },
             "version_group_details": [
-                {
-                    "level_learned_at": 15,
-                    "move_learn_method": {
-                        "name": "level-up",
-                        "url": "/api/v2/move-learn-method/1/"
-                    },
-                    "order": null,
-                    "version_group": {
-                        "name": "legends-arceus",
-                        "url": "/api/v2/version-group/24/"
-                    }
-                },
                 {
                     "level_learned_at": 15,
                     "move_learn_method": {