diff --git a/P3D/Content/Pokemon/Overworld/Normal/668_female.png b/P3D/Content/Pokemon/Overworld/Normal/668_f.png
similarity index 100%
rename from P3D/Content/Pokemon/Overworld/Normal/668_female.png
rename to P3D/Content/Pokemon/Overworld/Normal/668_f.png
diff --git a/P3D/Content/Pokemon/Overworld/Normal/668_male.png b/P3D/Content/Pokemon/Overworld/Normal/668_m.png
similarity index 100%
rename from P3D/Content/Pokemon/Overworld/Normal/668_male.png
rename to P3D/Content/Pokemon/Overworld/Normal/668_m.png
diff --git a/P3D/Content/Pokemon/Overworld/Normal/678_female.png b/P3D/Content/Pokemon/Overworld/Normal/678_f.png
similarity index 100%
rename from P3D/Content/Pokemon/Overworld/Normal/678_female.png
rename to P3D/Content/Pokemon/Overworld/Normal/678_f.png
diff --git a/P3D/Content/Pokemon/Overworld/Normal/678_male.png b/P3D/Content/Pokemon/Overworld/Normal/678_m.png
similarity index 100%
rename from P3D/Content/Pokemon/Overworld/Normal/678_male.png
rename to P3D/Content/Pokemon/Overworld/Normal/678_m.png
diff --git a/P3D/Content/Pokemon/Overworld/Shiny/668_female.png b/P3D/Content/Pokemon/Overworld/Shiny/668_f.png
similarity index 100%
rename from P3D/Content/Pokemon/Overworld/Shiny/668_female.png
rename to P3D/Content/Pokemon/Overworld/Shiny/668_f.png
diff --git a/P3D/Content/Pokemon/Overworld/Shiny/668_male.png b/P3D/Content/Pokemon/Overworld/Shiny/668_m.png
similarity index 100%
rename from P3D/Content/Pokemon/Overworld/Shiny/668_male.png
rename to P3D/Content/Pokemon/Overworld/Shiny/668_m.png
diff --git a/P3D/Content/Pokemon/Overworld/Shiny/678_female.png b/P3D/Content/Pokemon/Overworld/Shiny/678_f.png
similarity index 100%
rename from P3D/Content/Pokemon/Overworld/Shiny/678_female.png
rename to P3D/Content/Pokemon/Overworld/Shiny/678_f.png
diff --git a/P3D/Content/Pokemon/Overworld/Shiny/678_male.png b/P3D/Content/Pokemon/Overworld/Shiny/678_m.png
similarity index 100%
rename from P3D/Content/Pokemon/Overworld/Shiny/678_male.png
rename to P3D/Content/Pokemon/Overworld/Shiny/678_m.png
diff --git a/P3D/Content/Pokemon/Sprites/592_f.png b/P3D/Content/Pokemon/Sprites/592_f.png
new file mode 100644
index 000000000..a3cb9bdab
Binary files /dev/null and b/P3D/Content/Pokemon/Sprites/592_f.png differ
diff --git a/P3D/Content/Pokemon/Sprites/592.png b/P3D/Content/Pokemon/Sprites/592_m.png
similarity index 100%
rename from P3D/Content/Pokemon/Sprites/592.png
rename to P3D/Content/Pokemon/Sprites/592_m.png
diff --git a/P3D/Content/Pokemon/Sprites/593_f.png b/P3D/Content/Pokemon/Sprites/593_f.png
new file mode 100644
index 000000000..c4909e989
Binary files /dev/null and b/P3D/Content/Pokemon/Sprites/593_f.png differ
diff --git a/P3D/Content/Pokemon/Sprites/593.png b/P3D/Content/Pokemon/Sprites/593_m.png
similarity index 100%
rename from P3D/Content/Pokemon/Sprites/593.png
rename to P3D/Content/Pokemon/Sprites/593_m.png
diff --git a/P3D/Content/Pokemon/Sprites/668f.png b/P3D/Content/Pokemon/Sprites/668_f.png
similarity index 100%
rename from P3D/Content/Pokemon/Sprites/668f.png
rename to P3D/Content/Pokemon/Sprites/668_f.png
diff --git a/P3D/Content/Pokemon/Sprites/668m.png b/P3D/Content/Pokemon/Sprites/668_m.png
similarity index 100%
rename from P3D/Content/Pokemon/Sprites/668m.png
rename to P3D/Content/Pokemon/Sprites/668_m.png
diff --git a/P3D/P3D.vbproj b/P3D/P3D.vbproj
index f4b6fea14..a5af30786 100644
--- a/P3D/P3D.vbproj
+++ b/P3D/P3D.vbproj
@@ -13607,6 +13607,18 @@
     <Content Include="Content\Pokemon\Overworld\Normal\646_white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\Pokemon\Overworld\Normal\668_f.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Pokemon\Overworld\Normal\668_m.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Pokemon\Overworld\Normal\678_f.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Pokemon\Overworld\Normal\678_m.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Content\Pokemon\Overworld\Normal\723.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -13812,10 +13824,10 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="Content\Pokemon\Overworld\Shiny\303_mega.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="Content\Pokemon\Overworld\Shiny\319_mega.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="Content\Pokemon\Overworld\Shiny\37_alola.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -13853,13 +13865,27 @@
     <Content Include="Content\Pokemon\Overworld\Shiny\53_alola.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Pokemon\Overworld\Shiny\646.png" />
+    <Content Include="Content\Pokemon\Overworld\Shiny\646.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Content\Pokemon\Overworld\Shiny\646_black.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="Content\Pokemon\Overworld\Shiny\646_white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\Pokemon\Overworld\Shiny\668_f.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Pokemon\Overworld\Shiny\668_m.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Pokemon\Overworld\Shiny\678_f.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Pokemon\Overworld\Shiny\678_m.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Content\Pokemon\Overworld\Shiny\719_mega.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -14322,6 +14348,9 @@
     <Content Include="Content\Pokemon\Sprites\172.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\Pokemon\Sprites\172_spiky-eared.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Content\Pokemon\Sprites\173.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -16092,10 +16121,16 @@
     <Content Include="Content\Pokemon\Sprites\591.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Pokemon\Sprites\592.png">
+    <Content Include="Content\Pokemon\Sprites\592_f.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Pokemon\Sprites\593.png">
+    <Content Include="Content\Pokemon\Sprites\592_m.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Pokemon\Sprites\593_f.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Pokemon\Sprites\593_m.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="Content\Pokemon\Sprites\594.png">
@@ -16440,10 +16475,10 @@
     <Content Include="Content\Pokemon\Sprites\667.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Pokemon\Sprites\668f.png">
+    <Content Include="Content\Pokemon\Sprites\668_f.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Pokemon\Sprites\668m.png">
+    <Content Include="Content\Pokemon\Sprites\668_m.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="Content\Pokemon\Sprites\669.png">
@@ -21693,12 +21728,6 @@
     <Content Include="Content\Pokemon\Overworld\Normal\667.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Pokemon\Overworld\Normal\668_female.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\Pokemon\Overworld\Normal\668_male.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="Content\Pokemon\Overworld\Normal\669_blue.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -21795,12 +21824,6 @@
     <Content Include="Content\Pokemon\Overworld\Normal\677.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Pokemon\Overworld\Normal\678_female.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\Pokemon\Overworld\Normal\678_male.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="Content\Pokemon\Overworld\Normal\679.PNG">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -24363,12 +24386,6 @@
     <Content Include="Content\Pokemon\Overworld\Shiny\667.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Pokemon\Overworld\Shiny\668_female.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\Pokemon\Overworld\Shiny\668_male.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="Content\Pokemon\Overworld\Shiny\669_blue.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -24465,12 +24482,6 @@
     <Content Include="Content\Pokemon\Overworld\Shiny\677.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Pokemon\Overworld\Shiny\678_female.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\Pokemon\Overworld\Shiny\678_male.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="Content\Pokemon\Overworld\Shiny\679.PNG">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
diff --git a/P3D/Pokemon/Monster/Pokemon.vb b/P3D/Pokemon/Monster/Pokemon.vb
index b3e142f90..4d472974a 100644
--- a/P3D/Pokemon/Monster/Pokemon.vb
+++ b/P3D/Pokemon/Monster/Pokemon.vb
@@ -2513,7 +2513,7 @@ Public Class Pokemon
     Private Function GetTexture(ByVal index As Integer) As Texture2D
         Dim TextureNumberSuffix As String = ""
         If Me.AnimationName.Contains("_") Then
-            TextureNumberSuffix = AnimationName.Remove(0, GetName.Length)
+            TextureNumberSuffix = AnimationName.Remove(0, OriginalName.Length)
         End If
         If Textures(index) Is Nothing Then
             Select Case index
diff --git a/P3D/Pokemon/Monster/Resource/PokemonForms.vb b/P3D/Pokemon/Monster/Resource/PokemonForms.vb
index 2fa98f56e..d06a23bc7 100644
--- a/P3D/Pokemon/Monster/Resource/PokemonForms.vb
+++ b/P3D/Pokemon/Monster/Resource/PokemonForms.vb
@@ -2812,18 +2812,18 @@ Public Class PokemonForms
         Public Overrides Function GetAnimationName(ByVal P As Pokemon) As String
             Select Case P.Gender
                 Case Pokemon.Genders.Male
-                    Return P.OriginalName & "_male"
+                    Return P.OriginalName & "_m"
                 Case Else
-                    Return P.OriginalName & "_female"
+                    Return P.OriginalName & "_f"
             End Select
         End Function
 
         Public Overrides Function GetOverworldAddition(ByVal P As Pokemon) As String
             Select Case P.Gender
                 Case Pokemon.Genders.Male
-                    Return "_male"
+                    Return "_m"
                 Case Else
-                    Return "_female"
+                    Return "_f"
             End Select
         End Function
     End Class