diff --git a/data/species.json b/data/species.json
index 3ef70709..9bdfba46 100644
--- a/data/species.json
+++ b/data/species.json
@@ -7188,7 +7188,7 @@
         "num": 669,
         "formeNum": 1,
         "base": "Flabébé",
-        "forme": "Blue",
+        "forme": "Yellow",
         "sid": "s21409"
     },
     "s21410": {
@@ -7204,7 +7204,7 @@
         "num": 669,
         "formeNum": 3,
         "base": "Flabébé",
-        "forme": "White",
+        "forme": "Blue",
         "sid": "s21411"
     },
     "s21412": {
@@ -7212,7 +7212,7 @@
         "num": 669,
         "formeNum": 4,
         "base": "Flabébé",
-        "forme": "Yellow",
+        "forme": "White",
         "sid": "s21412"
     },
     "s21440": {
@@ -7228,7 +7228,7 @@
         "num": 670,
         "formeNum": 1,
         "base": "Floette",
-        "forme": "Blue",
+        "forme": "Yellow",
         "sid": "s21441"
     },
     "s21442": {
@@ -7244,7 +7244,7 @@
         "num": 670,
         "formeNum": 3,
         "base": "Floette",
-        "forme": "White",
+        "forme": "Blue",
         "sid": "s21443"
     },
     "s21444": {
@@ -7252,7 +7252,7 @@
         "num": 670,
         "formeNum": 4,
         "base": "Floette",
-        "forme": "Yellow",
+        "forme": "White",
         "sid": "s21444"
     },
     "s21445": {
@@ -7276,7 +7276,7 @@
         "num": 671,
         "formeNum": 1,
         "base": "Florges",
-        "forme": "Blue",
+        "forme": "Yellow",
         "sid": "s21473"
     },
     "s21474": {
@@ -7292,7 +7292,7 @@
         "num": 671,
         "formeNum": 3,
         "base": "Florges",
-        "forme": "White",
+        "forme": "Blue",
         "sid": "s21475"
     },
     "s21476": {
@@ -7300,7 +7300,7 @@
         "num": 671,
         "formeNum": 4,
         "base": "Florges",
-        "forme": "Yellow",
+        "forme": "White",
         "sid": "s21476"
     },
     "s21504": {
diff --git a/src/dex/s21409-s.png b/src/dex/s21409-s.png
index e657562f..c589b28a 100644
Binary files a/src/dex/s21409-s.png and b/src/dex/s21409-s.png differ
diff --git a/src/dex/s21409.png b/src/dex/s21409.png
index 4a76e660..37be8f10 100644
Binary files a/src/dex/s21409.png and b/src/dex/s21409.png differ
diff --git a/src/dex/s21411-s.png b/src/dex/s21411-s.png
index 39164d6b..e657562f 100644
Binary files a/src/dex/s21411-s.png and b/src/dex/s21411-s.png differ
diff --git a/src/dex/s21411.png b/src/dex/s21411.png
index a1634a74..4a76e660 100644
Binary files a/src/dex/s21411.png and b/src/dex/s21411.png differ
diff --git a/src/dex/s21412-s.png b/src/dex/s21412-s.png
index c589b28a..39164d6b 100644
Binary files a/src/dex/s21412-s.png and b/src/dex/s21412-s.png differ
diff --git a/src/dex/s21412.png b/src/dex/s21412.png
index 37be8f10..a1634a74 100644
Binary files a/src/dex/s21412.png and b/src/dex/s21412.png differ
diff --git a/src/dex/s21441-s.png b/src/dex/s21441-s.png
index a9549935..cf10051f 100644
Binary files a/src/dex/s21441-s.png and b/src/dex/s21441-s.png differ
diff --git a/src/dex/s21441.png b/src/dex/s21441.png
index ac40f9eb..99597a90 100644
Binary files a/src/dex/s21441.png and b/src/dex/s21441.png differ
diff --git a/src/dex/s21443-s.png b/src/dex/s21443-s.png
index 90f06ac9..a9549935 100644
Binary files a/src/dex/s21443-s.png and b/src/dex/s21443-s.png differ
diff --git a/src/dex/s21443.png b/src/dex/s21443.png
index ccf992bd..ac40f9eb 100644
Binary files a/src/dex/s21443.png and b/src/dex/s21443.png differ
diff --git a/src/dex/s21444-s.png b/src/dex/s21444-s.png
index cf10051f..90f06ac9 100644
Binary files a/src/dex/s21444-s.png and b/src/dex/s21444-s.png differ
diff --git a/src/dex/s21444.png b/src/dex/s21444.png
index 99597a90..ccf992bd 100644
Binary files a/src/dex/s21444.png and b/src/dex/s21444.png differ
diff --git a/src/dex/s21473-s.png b/src/dex/s21473-s.png
index a4a4d10c..09e528da 100644
Binary files a/src/dex/s21473-s.png and b/src/dex/s21473-s.png differ
diff --git a/src/dex/s21473.png b/src/dex/s21473.png
index 6ff8de6a..2e96c208 100644
Binary files a/src/dex/s21473.png and b/src/dex/s21473.png differ
diff --git a/src/dex/s21475-s.png b/src/dex/s21475-s.png
index d34cfe00..a4a4d10c 100644
Binary files a/src/dex/s21475-s.png and b/src/dex/s21475-s.png differ
diff --git a/src/dex/s21475.png b/src/dex/s21475.png
index 24375d8f..6ff8de6a 100644
Binary files a/src/dex/s21475.png and b/src/dex/s21475.png differ
diff --git a/src/dex/s21476-s.png b/src/dex/s21476-s.png
index 09e528da..d34cfe00 100644
Binary files a/src/dex/s21476-s.png and b/src/dex/s21476-s.png differ
diff --git a/src/dex/s21476.png b/src/dex/s21476.png
index 2e96c208..24375d8f 100644
Binary files a/src/dex/s21476.png and b/src/dex/s21476.png differ
diff --git a/src/minisprites/pokemon/gen6/s21409.png b/src/minisprites/pokemon/gen6/s21409.png
index 718da631..2bdb4f8e 100644
Binary files a/src/minisprites/pokemon/gen6/s21409.png and b/src/minisprites/pokemon/gen6/s21409.png differ
diff --git a/src/minisprites/pokemon/gen6/s21411.png b/src/minisprites/pokemon/gen6/s21411.png
index 912c9500..718da631 100644
Binary files a/src/minisprites/pokemon/gen6/s21411.png and b/src/minisprites/pokemon/gen6/s21411.png differ
diff --git a/src/minisprites/pokemon/gen6/s21412.png b/src/minisprites/pokemon/gen6/s21412.png
index 2bdb4f8e..912c9500 100644
Binary files a/src/minisprites/pokemon/gen6/s21412.png and b/src/minisprites/pokemon/gen6/s21412.png differ
diff --git a/src/minisprites/pokemon/gen6/s21441.png b/src/minisprites/pokemon/gen6/s21441.png
index e2aebede..7adc12cc 100644
Binary files a/src/minisprites/pokemon/gen6/s21441.png and b/src/minisprites/pokemon/gen6/s21441.png differ
diff --git a/src/minisprites/pokemon/gen6/s21443.png b/src/minisprites/pokemon/gen6/s21443.png
index 62a68d43..e2aebede 100644
Binary files a/src/minisprites/pokemon/gen6/s21443.png and b/src/minisprites/pokemon/gen6/s21443.png differ
diff --git a/src/minisprites/pokemon/gen6/s21444.png b/src/minisprites/pokemon/gen6/s21444.png
index 7adc12cc..62a68d43 100644
Binary files a/src/minisprites/pokemon/gen6/s21444.png and b/src/minisprites/pokemon/gen6/s21444.png differ
diff --git a/src/minisprites/pokemon/gen6/s21473.png b/src/minisprites/pokemon/gen6/s21473.png
index 8dd5f513..fe6e315a 100644
Binary files a/src/minisprites/pokemon/gen6/s21473.png and b/src/minisprites/pokemon/gen6/s21473.png differ
diff --git a/src/minisprites/pokemon/gen6/s21475.png b/src/minisprites/pokemon/gen6/s21475.png
index 36b4443e..8dd5f513 100644
Binary files a/src/minisprites/pokemon/gen6/s21475.png and b/src/minisprites/pokemon/gen6/s21475.png differ
diff --git a/src/minisprites/pokemon/gen6/s21476.png b/src/minisprites/pokemon/gen6/s21476.png
index fe6e315a..36b4443e 100644
Binary files a/src/minisprites/pokemon/gen6/s21476.png and b/src/minisprites/pokemon/gen6/s21476.png differ
diff --git a/src/models/s21409-b-s.gif b/src/models/s21409-b-s.gif
index 62db1671..1c9415f4 100644
Binary files a/src/models/s21409-b-s.gif and b/src/models/s21409-b-s.gif differ
diff --git a/src/models/s21409-b.gif b/src/models/s21409-b.gif
index 9cdd47d9..451fccef 100644
Binary files a/src/models/s21409-b.gif and b/src/models/s21409-b.gif differ
diff --git a/src/models/s21409-s.gif b/src/models/s21409-s.gif
index 0de9051c..0afdc7ab 100644
Binary files a/src/models/s21409-s.gif and b/src/models/s21409-s.gif differ
diff --git a/src/models/s21409.gif b/src/models/s21409.gif
index 00c46bf6..a2807c43 100644
Binary files a/src/models/s21409.gif and b/src/models/s21409.gif differ
diff --git a/src/models/s21411-b-s.gif b/src/models/s21411-b-s.gif
index 3597c6d7..62db1671 100644
Binary files a/src/models/s21411-b-s.gif and b/src/models/s21411-b-s.gif differ
diff --git a/src/models/s21411-b.gif b/src/models/s21411-b.gif
index 609abafb..9cdd47d9 100644
Binary files a/src/models/s21411-b.gif and b/src/models/s21411-b.gif differ
diff --git a/src/models/s21411-s.gif b/src/models/s21411-s.gif
index 6af8439d..0de9051c 100644
Binary files a/src/models/s21411-s.gif and b/src/models/s21411-s.gif differ
diff --git a/src/models/s21411.gif b/src/models/s21411.gif
index 18435016..00c46bf6 100644
Binary files a/src/models/s21411.gif and b/src/models/s21411.gif differ
diff --git a/src/models/s21412-b-s.gif b/src/models/s21412-b-s.gif
index 1c9415f4..3597c6d7 100644
Binary files a/src/models/s21412-b-s.gif and b/src/models/s21412-b-s.gif differ
diff --git a/src/models/s21412-b.gif b/src/models/s21412-b.gif
index 451fccef..609abafb 100644
Binary files a/src/models/s21412-b.gif and b/src/models/s21412-b.gif differ
diff --git a/src/models/s21412-s.gif b/src/models/s21412-s.gif
index 0afdc7ab..6af8439d 100644
Binary files a/src/models/s21412-s.gif and b/src/models/s21412-s.gif differ
diff --git a/src/models/s21412.gif b/src/models/s21412.gif
index a2807c43..18435016 100644
Binary files a/src/models/s21412.gif and b/src/models/s21412.gif differ
diff --git a/src/models/s21441-b-s.gif b/src/models/s21441-b-s.gif
index b551deec..3ec90e7b 100644
Binary files a/src/models/s21441-b-s.gif and b/src/models/s21441-b-s.gif differ
diff --git a/src/models/s21441-b.gif b/src/models/s21441-b.gif
index 676f21c9..ff99f620 100644
Binary files a/src/models/s21441-b.gif and b/src/models/s21441-b.gif differ
diff --git a/src/models/s21441-s.gif b/src/models/s21441-s.gif
index 4bbe8653..bdf32a54 100644
Binary files a/src/models/s21441-s.gif and b/src/models/s21441-s.gif differ
diff --git a/src/models/s21441.gif b/src/models/s21441.gif
index 30e944fb..19c636d0 100644
Binary files a/src/models/s21441.gif and b/src/models/s21441.gif differ
diff --git a/src/models/s21443-b-s.gif b/src/models/s21443-b-s.gif
index 456b570c..b551deec 100644
Binary files a/src/models/s21443-b-s.gif and b/src/models/s21443-b-s.gif differ
diff --git a/src/models/s21443-b.gif b/src/models/s21443-b.gif
index bbe52de0..676f21c9 100644
Binary files a/src/models/s21443-b.gif and b/src/models/s21443-b.gif differ
diff --git a/src/models/s21443-s.gif b/src/models/s21443-s.gif
index 4e142c45..4bbe8653 100644
Binary files a/src/models/s21443-s.gif and b/src/models/s21443-s.gif differ
diff --git a/src/models/s21443.gif b/src/models/s21443.gif
index d312ecc6..30e944fb 100644
Binary files a/src/models/s21443.gif and b/src/models/s21443.gif differ
diff --git a/src/models/s21444-b-s.gif b/src/models/s21444-b-s.gif
index 3ec90e7b..456b570c 100644
Binary files a/src/models/s21444-b-s.gif and b/src/models/s21444-b-s.gif differ
diff --git a/src/models/s21444-b.gif b/src/models/s21444-b.gif
index ff99f620..bbe52de0 100644
Binary files a/src/models/s21444-b.gif and b/src/models/s21444-b.gif differ
diff --git a/src/models/s21444-s.gif b/src/models/s21444-s.gif
index bdf32a54..4e142c45 100644
Binary files a/src/models/s21444-s.gif and b/src/models/s21444-s.gif differ
diff --git a/src/models/s21444.gif b/src/models/s21444.gif
index 19c636d0..d312ecc6 100644
Binary files a/src/models/s21444.gif and b/src/models/s21444.gif differ
diff --git a/src/models/s21473-b-s.gif b/src/models/s21473-b-s.gif
index 7e9e8f5a..60977a65 100644
Binary files a/src/models/s21473-b-s.gif and b/src/models/s21473-b-s.gif differ
diff --git a/src/models/s21473-b.gif b/src/models/s21473-b.gif
index c75570f1..1e5133d5 100644
Binary files a/src/models/s21473-b.gif and b/src/models/s21473-b.gif differ
diff --git a/src/models/s21473-s.gif b/src/models/s21473-s.gif
index b2944e1a..8e238299 100644
Binary files a/src/models/s21473-s.gif and b/src/models/s21473-s.gif differ
diff --git a/src/models/s21473.gif b/src/models/s21473.gif
index 2058bb7d..0260ecb9 100644
Binary files a/src/models/s21473.gif and b/src/models/s21473.gif differ
diff --git a/src/models/s21475-b-s.gif b/src/models/s21475-b-s.gif
index c0e8b146..7e9e8f5a 100644
Binary files a/src/models/s21475-b-s.gif and b/src/models/s21475-b-s.gif differ
diff --git a/src/models/s21475-b.gif b/src/models/s21475-b.gif
index 4989d908..c75570f1 100644
Binary files a/src/models/s21475-b.gif and b/src/models/s21475-b.gif differ
diff --git a/src/models/s21475-s.gif b/src/models/s21475-s.gif
index 1003f148..b2944e1a 100644
Binary files a/src/models/s21475-s.gif and b/src/models/s21475-s.gif differ
diff --git a/src/models/s21475.gif b/src/models/s21475.gif
index 144e641d..2058bb7d 100644
Binary files a/src/models/s21475.gif and b/src/models/s21475.gif differ
diff --git a/src/models/s21476-b-s.gif b/src/models/s21476-b-s.gif
index 60977a65..c0e8b146 100644
Binary files a/src/models/s21476-b-s.gif and b/src/models/s21476-b-s.gif differ
diff --git a/src/models/s21476-b.gif b/src/models/s21476-b.gif
index 1e5133d5..4989d908 100644
Binary files a/src/models/s21476-b.gif and b/src/models/s21476-b.gif differ
diff --git a/src/models/s21476-s.gif b/src/models/s21476-s.gif
index 8e238299..1003f148 100644
Binary files a/src/models/s21476-s.gif and b/src/models/s21476-s.gif differ
diff --git a/src/models/s21476.gif b/src/models/s21476.gif
index 0260ecb9..144e641d 100644
Binary files a/src/models/s21476.gif and b/src/models/s21476.gif differ