diff --git a/NadekoBot/Modules/Pokemon/DefaultMoves.cs b/NadekoBot/Modules/Pokemon/DefaultMoves.cs
index 0072f6bf..4cdba343 100644
--- a/NadekoBot/Modules/Pokemon/DefaultMoves.cs
+++ b/NadekoBot/Modules/Pokemon/DefaultMoves.cs
@@ -79,7 +79,11 @@ namespace NadekoBot.Modules.Pokemon
                         {"bullet punch",16},
                         {"metal burst",16},
                         {"gear grind",16},
-                        {"magnet bomb",16}
+                        {"magnet bomb",16},
+                        {"fairy wind",17},
+                        {"draining kiss",17},
+                        {"dazzling gleam",17},
+                        {"play rough",17}
                     };
         
 
diff --git a/NadekoBot/Modules/Pokemon/PokemonModule.cs b/NadekoBot/Modules/Pokemon/PokemonModule.cs
index aace2e4f..ed181485 100644
--- a/NadekoBot/Modules/Pokemon/PokemonModule.cs
+++ b/NadekoBot/Modules/Pokemon/PokemonModule.cs
@@ -49,7 +49,7 @@ namespace NadekoBot.Modules.Pokemon
                 return PokemonTypesMain.IntToPokeType(setTypes[(long)id]);
             }
 
-            int remainder = Math.Abs((int)(id % 16));
+            int remainder = Math.Abs((int)(id % 18));
 
             return PokemonTypesMain.IntToPokeType(remainder);
         }
diff --git a/NadekoBot/Modules/Pokemon/PokemonTypes/BugType.cs b/NadekoBot/Modules/Pokemon/PokemonTypes/BugType.cs
index 64145fe0..00da7d7c 100644
--- a/NadekoBot/Modules/Pokemon/PokemonTypes/BugType.cs
+++ b/NadekoBot/Modules/Pokemon/PokemonTypes/BugType.cs
@@ -18,8 +18,10 @@ namespace NadekoBot.Modules.Pokemon.PokemonTypes
                 case "FIGHTING": return 0.5;
                 case "POISON": return 0.5;
                 case "FLYING": return 0.5;
+                case "GHOST": return 0.5;
                 case "PSYCHIC": return 2;
                 case "ROCK": return 0.5;
+                case "FAIRY": return 0.5;
                 case "DARK": return 2;
                 case "STEEL": return 0.5;
                 default: return 1;
diff --git a/NadekoBot/Modules/Pokemon/PokemonTypes/DarkType.cs b/NadekoBot/Modules/Pokemon/PokemonTypes/DarkType.cs
index 2e29eb2e..2b9287ed 100644
--- a/NadekoBot/Modules/Pokemon/PokemonTypes/DarkType.cs
+++ b/NadekoBot/Modules/Pokemon/PokemonTypes/DarkType.cs
@@ -17,7 +17,7 @@ namespace NadekoBot.Modules.Pokemon.PokemonTypes
                 case "PSYCHIC": return 2;
                 case "GHOST": return 2;
                 case "DARK": return 0.5;
-                case "STEEL": return 0.5;
+                case "FAIRY": return 0.5;
                 default: return 1;
             }
         }
diff --git a/NadekoBot/Modules/Pokemon/PokemonTypes/Dragontype.cs b/NadekoBot/Modules/Pokemon/PokemonTypes/Dragontype.cs
index 35ec6332..ae448af9 100644
--- a/NadekoBot/Modules/Pokemon/PokemonTypes/Dragontype.cs
+++ b/NadekoBot/Modules/Pokemon/PokemonTypes/Dragontype.cs
@@ -15,6 +15,7 @@ namespace NadekoBot.Modules.Pokemon.PokemonTypes
 
                 case "DRAGON": return 2;
                 case "STEEL": return 0.5;
+                case "FAIRY": return 0;
                 default: return 1;
             }
         }
diff --git a/NadekoBot/Modules/Pokemon/PokemonTypes/FairyType.cs b/NadekoBot/Modules/Pokemon/PokemonTypes/FairyType.cs
new file mode 100644
index 00000000..17c40b93
--- /dev/null
+++ b/NadekoBot/Modules/Pokemon/PokemonTypes/FairyType.cs
@@ -0,0 +1,33 @@
+using NadekoBot.Modules.Pokemon.PokeTypes;
+using System.Collections.Generic;
+
+namespace NadekoBot.Modules.Pokemon.PokemonTypes
+{
+    class FairyType : PokeType
+    {
+        static readonly string name = "FAIRY";
+        public static int numType = 17;
+
+        public double Multiplier(PokeType target)
+        {
+            switch (target.Name)
+            {
+
+                case "FIGHTING": return 2;
+                case "FIRE": return 0.5;
+                case "DARK": return 0.5;
+                case "POISON": return 0.5;
+                case "STEEL": return 2;
+                case "DRAGON": return 2;
+                default: return 1;
+            }
+        }
+        List<string> moves = new List<string>();
+
+        public string Name => name;
+
+        public string Image => "💫";
+
+        public int Num => numType;
+    }
+}
diff --git a/NadekoBot/Modules/Pokemon/PokemonTypes/FightingType.cs b/NadekoBot/Modules/Pokemon/PokemonTypes/FightingType.cs
index 6e0e9d09..a972595f 100644
--- a/NadekoBot/Modules/Pokemon/PokemonTypes/FightingType.cs
+++ b/NadekoBot/Modules/Pokemon/PokemonTypes/FightingType.cs
@@ -23,6 +23,7 @@ namespace NadekoBot.Modules.Pokemon.PokemonTypes
                 case "GHOST": return 0;
                 case "DARK": return 2;
                 case "STEEL": return 2;
+                case "FAIRY": return 0.5;
                 default: return 1;
             }
         }
diff --git a/NadekoBot/Modules/Pokemon/PokemonTypes/PoisonType.cs b/NadekoBot/Modules/Pokemon/PokemonTypes/PoisonType.cs
index 427508ed..ab1a0e3e 100644
--- a/NadekoBot/Modules/Pokemon/PokemonTypes/PoisonType.cs
+++ b/NadekoBot/Modules/Pokemon/PokemonTypes/PoisonType.cs
@@ -19,6 +19,7 @@ namespace NadekoBot.Modules.Pokemon.PokemonTypes
                 case "ROCK": return 0.5;
                 case "GHOST": return 0.5;
                 case "STEEL": return 0;
+                case "FAIRY": return 2;
                 default: return 1;
             }
         }
diff --git a/NadekoBot/Modules/Pokemon/PokemonTypes/PokeType.cs b/NadekoBot/Modules/Pokemon/PokemonTypes/PokeType.cs
index a7a861ce..efde0905 100644
--- a/NadekoBot/Modules/Pokemon/PokemonTypes/PokeType.cs
+++ b/NadekoBot/Modules/Pokemon/PokemonTypes/PokeType.cs
@@ -45,7 +45,8 @@ namespace NadekoBot.Modules.Pokemon.PokeTypes
             new GhostType(),
             new DragonType(),
             new DarkType(),
-            new SteelType()
+            new SteelType(),
+            new FairyType()
         };
 
         public static PokeType IntToPokeType(int id)
diff --git a/NadekoBot/Modules/Pokemon/PokemonTypes/PsychicType.cs b/NadekoBot/Modules/Pokemon/PokemonTypes/PsychicType.cs
index c386b884..e675091f 100644
--- a/NadekoBot/Modules/Pokemon/PokemonTypes/PsychicType.cs
+++ b/NadekoBot/Modules/Pokemon/PokemonTypes/PsychicType.cs
@@ -28,7 +28,7 @@ namespace NadekoBot.Modules.Pokemon.PokemonTypes
 
         public string Name => name;
 
-        public string Image => "💫";
+        public string Image => "🔮";
 
         public int Num => numType;
     }
diff --git a/NadekoBot/NadekoBot.csproj b/NadekoBot/NadekoBot.csproj
index f5960d68..1a56b634 100644
--- a/NadekoBot/NadekoBot.csproj
+++ b/NadekoBot/NadekoBot.csproj
@@ -194,6 +194,7 @@
     <Compile Include="Modules\Administration\Commands\RatelimitCommand.cs" />
     <Compile Include="Modules\Pokemon\DefaultMoves.cs" />
     <Compile Include="Modules\Pokemon\PokemonModule.cs" />
+    <Compile Include="Modules\Pokemon\PokemonTypes\FairyType.cs" />
     <Compile Include="Modules\Pokemon\PokemonTypes\IPokeTypeExtensions.cs" />
     <Compile Include="Modules\Pokemon\PokemonTypes\PokeType.cs" />
     <Compile Include="Modules\Pokemon\PokemonTypes\PsychicType.cs" />