diff --git a/data/pkmn.json b/data/pkmn.json
index fc3afdd9..938a2fac 100644
--- a/data/pkmn.json
+++ b/data/pkmn.json
@@ -282,7 +282,8 @@
       "jpn": "koratta"
     },
     "icons": {
-      ".": {}
+      ".": {},
+      "alola": {}
     },
     "name": {
       "eng": "Rattata",
@@ -382,7 +383,15 @@
       "cute": {
         "has_right": true
       },
-      "tough": {}
+      "tough": {},
+      "original-cap": {
+        "has_right": true
+      },
+      "hoenn-cap": {},
+      "sinnoh-cap": {},
+      "unova-cap": {},
+      "kalos-cap": {},
+      "alola-cap": {}
     },
     "name": {
       "eng": "Pikachu",
@@ -397,7 +406,8 @@
       "jpn": "raichu"
     },
     "icons": {
-      ".": {}
+      ".": {},
+      "alola": {}
     },
     "name": {
       "eng": "Raichu",
@@ -412,7 +422,8 @@
       "jpn": "sand"
     },
     "icons": {
-      ".": {}
+      ".": {},
+      "alola": {}
     },
     "name": {
       "eng": "Sandshrew",
@@ -427,7 +438,8 @@
       "jpn": "sandpan"
     },
     "icons": {
-      ".": {}
+      ".": {},
+      "alola": {}
     },
     "name": {
       "eng": "Sandslash",
@@ -566,7 +578,8 @@
       "jpn": "rokon"
     },
     "icons": {
-      ".": {}
+      ".": {},
+      "alola": {}
     },
     "name": {
       "eng": "Vulpix",
@@ -581,7 +594,8 @@
       "jpn": "kyukon"
     },
     "icons": {
-      ".": {}
+      ".": {},
+      "alola": {}
     },
     "name": {
       "eng": "Ninetales",
@@ -765,7 +779,8 @@
       "jpn": "digda"
     },
     "icons": {
-      ".": {}
+      ".": {},
+      "alola": {}
     },
     "name": {
       "eng": "Diglett",
@@ -780,7 +795,8 @@
       "jpn": "dugtrio"
     },
     "icons": {
-      ".": {}
+      ".": {},
+      "alola": {}
     },
     "name": {
       "eng": "Dugtrio",
@@ -795,7 +811,8 @@
       "jpn": "nyarth"
     },
     "icons": {
-      ".": {}
+      ".": {},
+      "alola": {}
     },
     "name": {
       "eng": "Meowth",
@@ -810,7 +827,8 @@
       "jpn": "persian"
     },
     "icons": {
-      ".": {}
+      ".": {},
+      "alola": {}
     },
     "name": {
       "eng": "Persian",
@@ -1130,7 +1148,8 @@
       "jpn": "ishitsubute"
     },
     "icons": {
-      ".": {}
+      ".": {},
+      "alola": {}
     },
     "name": {
       "eng": "Geodude",
@@ -1145,7 +1164,8 @@
       "jpn": "golone"
     },
     "icons": {
-      ".": {}
+      ".": {},
+      "alola": {}
     },
     "name": {
       "eng": "Graveler",
@@ -1160,7 +1180,8 @@
       "jpn": "golonya"
     },
     "icons": {
-      ".": {}
+      ".": {},
+      "alola": {}
     },
     "name": {
       "eng": "Golem",
@@ -1341,7 +1362,8 @@
       "jpn": "betbeter"
     },
     "icons": {
-      ".": {}
+      ".": {},
+      "alola": {}
     },
     "name": {
       "eng": "Grimer",
@@ -1356,7 +1378,8 @@
       "jpn": "betbeton"
     },
     "icons": {
-      ".": {}
+      ".": {},
+      "alola": {}
     },
     "name": {
       "eng": "Muk",
@@ -1569,7 +1592,8 @@
       "jpn": "nassy"
     },
     "icons": {
-      ".": {}
+      ".": {},
+      "alola": {}
     },
     "name": {
       "eng": "Exeggutor",
@@ -1599,7 +1623,8 @@
       "jpn": "garagara"
     },
     "icons": {
-      ".": {}
+      ".": {},
+      "alola": {}
     },
     "name": {
       "eng": "Marowak",
@@ -2612,7 +2637,8 @@
       "jpn": "pichu"
     },
     "icons": {
-      ".": {}
+      ".": {},
+      "spiky-eared": {}
     },
     "name": {
       "eng": "Pichu",
diff --git a/icons/pokemon/regular/diglett-alola.png b/icons/pokemon/regular/diglett-alola.png
new file mode 100644
index 00000000..ae3ebffa
Binary files /dev/null and b/icons/pokemon/regular/diglett-alola.png differ
diff --git a/icons/pokemon/regular/dugtrio-alola.png b/icons/pokemon/regular/dugtrio-alola.png
new file mode 100644
index 00000000..d932c66f
Binary files /dev/null and b/icons/pokemon/regular/dugtrio-alola.png differ
diff --git a/icons/pokemon/regular/exeggutor-alola.png b/icons/pokemon/regular/exeggutor-alola.png
new file mode 100644
index 00000000..3b3e0bc1
Binary files /dev/null and b/icons/pokemon/regular/exeggutor-alola.png differ
diff --git a/icons/pokemon/regular/geodude-alola.png b/icons/pokemon/regular/geodude-alola.png
new file mode 100644
index 00000000..a67e14bc
Binary files /dev/null and b/icons/pokemon/regular/geodude-alola.png differ
diff --git a/icons/pokemon/regular/golem-alola.png b/icons/pokemon/regular/golem-alola.png
new file mode 100644
index 00000000..9ea42b87
Binary files /dev/null and b/icons/pokemon/regular/golem-alola.png differ
diff --git a/icons/pokemon/regular/graveler-alola.png b/icons/pokemon/regular/graveler-alola.png
new file mode 100644
index 00000000..842912ee
Binary files /dev/null and b/icons/pokemon/regular/graveler-alola.png differ
diff --git a/icons/pokemon/regular/grimer-alola.png b/icons/pokemon/regular/grimer-alola.png
new file mode 100644
index 00000000..2da3d4e7
Binary files /dev/null and b/icons/pokemon/regular/grimer-alola.png differ
diff --git a/icons/pokemon/regular/marowak-alola.png b/icons/pokemon/regular/marowak-alola.png
new file mode 100644
index 00000000..564dcb54
Binary files /dev/null and b/icons/pokemon/regular/marowak-alola.png differ
diff --git a/icons/pokemon/regular/meowth-alola.png b/icons/pokemon/regular/meowth-alola.png
new file mode 100644
index 00000000..69188729
Binary files /dev/null and b/icons/pokemon/regular/meowth-alola.png differ
diff --git a/icons/pokemon/regular/muk-alola.png b/icons/pokemon/regular/muk-alola.png
new file mode 100644
index 00000000..286cb9e7
Binary files /dev/null and b/icons/pokemon/regular/muk-alola.png differ
diff --git a/icons/pokemon/regular/ninetales-alola.png b/icons/pokemon/regular/ninetales-alola.png
new file mode 100644
index 00000000..50cff6d2
Binary files /dev/null and b/icons/pokemon/regular/ninetales-alola.png differ
diff --git a/icons/pokemon/regular/persian-alola.png b/icons/pokemon/regular/persian-alola.png
new file mode 100644
index 00000000..3d23d6c5
Binary files /dev/null and b/icons/pokemon/regular/persian-alola.png differ
diff --git a/icons/pokemon/regular/pichu-spiky-eared.png b/icons/pokemon/regular/pichu-spiky-eared.png
new file mode 100644
index 00000000..9435a8d7
Binary files /dev/null and b/icons/pokemon/regular/pichu-spiky-eared.png differ
diff --git a/icons/pokemon/regular/pikachu-alola-cap.png b/icons/pokemon/regular/pikachu-alola-cap.png
new file mode 100644
index 00000000..e3028a35
Binary files /dev/null and b/icons/pokemon/regular/pikachu-alola-cap.png differ
diff --git a/icons/pokemon/regular/pikachu-kalos-cap.png b/icons/pokemon/regular/pikachu-kalos-cap.png
new file mode 100644
index 00000000..d8151fe0
Binary files /dev/null and b/icons/pokemon/regular/pikachu-kalos-cap.png differ
diff --git a/icons/pokemon/regular/pikachu-original-cap.png b/icons/pokemon/regular/pikachu-original-cap.png
new file mode 100644
index 00000000..f46ce717
Binary files /dev/null and b/icons/pokemon/regular/pikachu-original-cap.png differ
diff --git a/icons/pokemon/regular/pikachu-sinnoh-cap.png b/icons/pokemon/regular/pikachu-sinnoh-cap.png
new file mode 100644
index 00000000..7cbb328d
Binary files /dev/null and b/icons/pokemon/regular/pikachu-sinnoh-cap.png differ
diff --git a/icons/pokemon/regular/pikachu-unova-cap.png b/icons/pokemon/regular/pikachu-unova-cap.png
new file mode 100644
index 00000000..992d9276
Binary files /dev/null and b/icons/pokemon/regular/pikachu-unova-cap.png differ
diff --git a/icons/pokemon/regular/raichu-alola.png b/icons/pokemon/regular/raichu-alola.png
new file mode 100644
index 00000000..d330fb12
Binary files /dev/null and b/icons/pokemon/regular/raichu-alola.png differ
diff --git a/icons/pokemon/regular/raticate-alola.png b/icons/pokemon/regular/raticate-alola.png
new file mode 100644
index 00000000..89cbd5a0
Binary files /dev/null and b/icons/pokemon/regular/raticate-alola.png differ
diff --git a/icons/pokemon/regular/rattata-alola.png b/icons/pokemon/regular/rattata-alola.png
new file mode 100644
index 00000000..d346dfbd
Binary files /dev/null and b/icons/pokemon/regular/rattata-alola.png differ
diff --git a/icons/pokemon/regular/right/pikachu-original-cap.png b/icons/pokemon/regular/right/pikachu-original-cap.png
new file mode 100644
index 00000000..05d0d2d0
Binary files /dev/null and b/icons/pokemon/regular/right/pikachu-original-cap.png differ
diff --git a/icons/pokemon/regular/sandshrew-alola.png b/icons/pokemon/regular/sandshrew-alola.png
new file mode 100644
index 00000000..b109abca
Binary files /dev/null and b/icons/pokemon/regular/sandshrew-alola.png differ
diff --git a/icons/pokemon/regular/sandslash-alola.png b/icons/pokemon/regular/sandslash-alola.png
new file mode 100644
index 00000000..af9ee644
Binary files /dev/null and b/icons/pokemon/regular/sandslash-alola.png differ
diff --git a/icons/pokemon/regular/vulpix-alola.png b/icons/pokemon/regular/vulpix-alola.png
new file mode 100644
index 00000000..816e48fb
Binary files /dev/null and b/icons/pokemon/regular/vulpix-alola.png differ
diff --git a/icons/pokemon/shiny/diglett-alola.png b/icons/pokemon/shiny/diglett-alola.png
new file mode 100644
index 00000000..1568932d
Binary files /dev/null and b/icons/pokemon/shiny/diglett-alola.png differ
diff --git a/icons/pokemon/shiny/dugtrio-alola.png b/icons/pokemon/shiny/dugtrio-alola.png
new file mode 100644
index 00000000..f233acce
Binary files /dev/null and b/icons/pokemon/shiny/dugtrio-alola.png differ
diff --git a/icons/pokemon/shiny/exeggutor-alola.png b/icons/pokemon/shiny/exeggutor-alola.png
new file mode 100644
index 00000000..d1d607a8
Binary files /dev/null and b/icons/pokemon/shiny/exeggutor-alola.png differ
diff --git a/icons/pokemon/shiny/geodude-alola.png b/icons/pokemon/shiny/geodude-alola.png
new file mode 100644
index 00000000..bd6ef439
Binary files /dev/null and b/icons/pokemon/shiny/geodude-alola.png differ
diff --git a/icons/pokemon/shiny/golem-alola.png b/icons/pokemon/shiny/golem-alola.png
new file mode 100644
index 00000000..7efe8035
Binary files /dev/null and b/icons/pokemon/shiny/golem-alola.png differ
diff --git a/icons/pokemon/shiny/graveler-alola.png b/icons/pokemon/shiny/graveler-alola.png
new file mode 100644
index 00000000..749ca6e0
Binary files /dev/null and b/icons/pokemon/shiny/graveler-alola.png differ
diff --git a/icons/pokemon/shiny/grimer-alola.png b/icons/pokemon/shiny/grimer-alola.png
new file mode 100644
index 00000000..53ddea59
Binary files /dev/null and b/icons/pokemon/shiny/grimer-alola.png differ
diff --git a/icons/pokemon/shiny/marowak-alola.png b/icons/pokemon/shiny/marowak-alola.png
new file mode 100644
index 00000000..b79cd5d6
Binary files /dev/null and b/icons/pokemon/shiny/marowak-alola.png differ
diff --git a/icons/pokemon/shiny/meowth-alola.png b/icons/pokemon/shiny/meowth-alola.png
new file mode 100644
index 00000000..06e72bb8
Binary files /dev/null and b/icons/pokemon/shiny/meowth-alola.png differ
diff --git a/icons/pokemon/shiny/muk-alola.png b/icons/pokemon/shiny/muk-alola.png
new file mode 100644
index 00000000..a13938b4
Binary files /dev/null and b/icons/pokemon/shiny/muk-alola.png differ
diff --git a/icons/pokemon/shiny/ninetales-alola.png b/icons/pokemon/shiny/ninetales-alola.png
new file mode 100644
index 00000000..24b2d0f5
Binary files /dev/null and b/icons/pokemon/shiny/ninetales-alola.png differ
diff --git a/icons/pokemon/shiny/persian-alola.png b/icons/pokemon/shiny/persian-alola.png
new file mode 100644
index 00000000..00d3ab79
Binary files /dev/null and b/icons/pokemon/shiny/persian-alola.png differ
diff --git a/icons/pokemon/shiny/pichu-spiky-eared.png b/icons/pokemon/shiny/pichu-spiky-eared.png
new file mode 100644
index 00000000..0445e081
Binary files /dev/null and b/icons/pokemon/shiny/pichu-spiky-eared.png differ
diff --git a/icons/pokemon/shiny/pikachu-alola-cap.png b/icons/pokemon/shiny/pikachu-alola-cap.png
new file mode 100644
index 00000000..3b918075
Binary files /dev/null and b/icons/pokemon/shiny/pikachu-alola-cap.png differ
diff --git a/icons/pokemon/shiny/pikachu-kalos-cap.png b/icons/pokemon/shiny/pikachu-kalos-cap.png
new file mode 100644
index 00000000..db2b3889
Binary files /dev/null and b/icons/pokemon/shiny/pikachu-kalos-cap.png differ
diff --git a/icons/pokemon/shiny/pikachu-original-cap.png b/icons/pokemon/shiny/pikachu-original-cap.png
new file mode 100644
index 00000000..42f72012
Binary files /dev/null and b/icons/pokemon/shiny/pikachu-original-cap.png differ
diff --git a/icons/pokemon/shiny/pikachu-sinnoh-cap.png b/icons/pokemon/shiny/pikachu-sinnoh-cap.png
new file mode 100644
index 00000000..dd8e8f59
Binary files /dev/null and b/icons/pokemon/shiny/pikachu-sinnoh-cap.png differ
diff --git a/icons/pokemon/shiny/pikachu-unova-cap.png b/icons/pokemon/shiny/pikachu-unova-cap.png
new file mode 100644
index 00000000..a3441098
Binary files /dev/null and b/icons/pokemon/shiny/pikachu-unova-cap.png differ
diff --git a/icons/pokemon/shiny/raichu-alola.png b/icons/pokemon/shiny/raichu-alola.png
new file mode 100644
index 00000000..d222bdd9
Binary files /dev/null and b/icons/pokemon/shiny/raichu-alola.png differ
diff --git a/icons/pokemon/shiny/raticate-alola.png b/icons/pokemon/shiny/raticate-alola.png
new file mode 100644
index 00000000..669885e2
Binary files /dev/null and b/icons/pokemon/shiny/raticate-alola.png differ
diff --git a/icons/pokemon/shiny/rattata-alola.png b/icons/pokemon/shiny/rattata-alola.png
new file mode 100644
index 00000000..d127ba58
Binary files /dev/null and b/icons/pokemon/shiny/rattata-alola.png differ
diff --git a/icons/pokemon/shiny/right/pikachu-original-cap.png b/icons/pokemon/shiny/right/pikachu-original-cap.png
new file mode 100644
index 00000000..0d356baf
Binary files /dev/null and b/icons/pokemon/shiny/right/pikachu-original-cap.png differ
diff --git a/icons/pokemon/shiny/sandshrew-alola.png b/icons/pokemon/shiny/sandshrew-alola.png
new file mode 100644
index 00000000..e768ee2b
Binary files /dev/null and b/icons/pokemon/shiny/sandshrew-alola.png differ
diff --git a/icons/pokemon/shiny/sandslash-alola.png b/icons/pokemon/shiny/sandslash-alola.png
new file mode 100644
index 00000000..08d1cb04
Binary files /dev/null and b/icons/pokemon/shiny/sandslash-alola.png differ
diff --git a/icons/pokemon/shiny/vulpix-alola.png b/icons/pokemon/shiny/vulpix-alola.png
new file mode 100644
index 00000000..ed401abb
Binary files /dev/null and b/icons/pokemon/shiny/vulpix-alola.png differ