diff --git a/PckStudio.Core/PckStudio.Core.csproj b/PckStudio.Core/PckStudio.Core.csproj
index fd6c7cf3..3566cf89 100644
--- a/PckStudio.Core/PckStudio.Core.csproj
+++ b/PckStudio.Core/PckStudio.Core.csproj
@@ -159,6 +159,11 @@
     <Compile Include="NamedData.cs" />
     <Compile Include="PackInfo.cs" />
     <Compile Include="DLC\DLCPackageType.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
     <Compile Include="ResourceCategory.cs" />
     <Compile Include="ResourceLocation.cs" />
     <Compile Include="ResourceLocations.cs" />
@@ -174,11 +179,6 @@
     <Compile Include="Skin\SkinMetaData.cs" />
     <Compile Include="Skin\SkinModel.cs" />
     <Compile Include="Skin\SkinPartOffset.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
     <Compile Include="Extensions\TagCompoundExtensions.cs" />
     <Compile Include="Tiles.cs" />
   </ItemGroup>
@@ -205,57 +205,74 @@
   <ItemGroup>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
+      <SubType>Designer</SubType>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\additionalMapiconsData.json" />
-    <None Include="Resources\bannerData.json" />
-    <None Include="Resources\blockData.json" />
+    <None Include="Resources\atlas\additionalMapiconsData.json" />
+    <None Include="Resources\atlas\bannerData.json" />
+    <None Include="Resources\atlas\blockData.json" />
+    <None Include="Resources\atlas\experienceOrbData.json" />
+    <None Include="Resources\atlas\explosionData.json" />
+    <None Include="Resources\atlas\itemData.json" />
+    <None Include="Resources\atlas\mapIconData.json" />
+    <None Include="Resources\atlas\moonPhaseData.json" />
+    <None Include="Resources\atlas\paintingData.json" />
+    <None Include="Resources\atlas\particleData.json" />
     <None Include="Resources\Comparison.png" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Resources\entityBehavioursData.json" />
     <None Include="Resources\entityMaterialsData.json" />
     <None Include="Resources\entityModelsData.json" />
-    <None Include="Resources\experienceOrbData.json" />
-    <None Include="Resources\explosionData.json" />
-    <None Include="Resources\itemData.json" />
-    <None Include="Resources\mapIconData.json" />
-    <None Include="Resources\moonPhaseData.json" />
-    <None Include="Resources\paintingData.json" />
-    <None Include="Resources\particleData.json" />
     <None Include="Resources\TexturePackIcon.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\additional_mapicons.png" />
+    <None Include="Resources\armor\chain.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\banners.png" />
+    <None Include="Resources\armor\cloth.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\experience_orbs.png" />
+    <None Include="Resources\armor\cloth_b.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\items.png" />
+    <None Include="Resources\armor\diamond.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\map_icons.png" />
+    <None Include="Resources\armor\gold.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\moon_phases.png" />
+    <None Include="Resources\armor\iron.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\paintings.png" />
+    <None Include="Resources\armor\turtle.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\particles.png" />
+    <None Include="Resources\clock.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\terrain.png" />
+    <None Include="Resources\compass.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\explosion.png" />
+    <None Include="Resources\fire_layer_0.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\fire_layer_1.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Resources\atlas\additional_mapicons.png" />
+    <Content Include="Resources\atlas\banners.png" />
+    <Content Include="Resources\atlas\experience_orbs.png" />
+    <Content Include="Resources\atlas\explosion.png" />
+    <Content Include="Resources\atlas\items.png" />
+    <Content Include="Resources\atlas\map_icons.png" />
+    <Content Include="Resources\atlas\moon_phases.png" />
+    <Content Include="Resources\atlas\paintings.png" />
+    <Content Include="Resources\atlas\particles.png" />
+    <Content Include="Resources\atlas\terrain.png" />
+    <None Include="Resources\unknown_pack.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/PckStudio.Core/Properties/Resources.Designer.cs b/PckStudio.Core/Properties/Resources.Designer.cs
index 30de97d7..a6ce72c8 100644
--- a/PckStudio.Core/Properties/Resources.Designer.cs
+++ b/PckStudio.Core/Properties/Resources.Designer.cs
@@ -179,6 +179,46 @@ namespace PckStudio.Core.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap chain {
+            get {
+                object obj = ResourceManager.GetObject("chain", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap clock {
+            get {
+                object obj = ResourceManager.GetObject("clock", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap cloth {
+            get {
+                object obj = ResourceManager.GetObject("cloth", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap cloth_b {
+            get {
+                object obj = ResourceManager.GetObject("cloth_b", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -189,6 +229,26 @@ namespace PckStudio.Core.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap compass {
+            get {
+                object obj = ResourceManager.GetObject("compass", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap diamond {
+            get {
+                object obj = ResourceManager.GetObject("diamond", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -271,6 +331,46 @@ namespace PckStudio.Core.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap fire_layer_0 {
+            get {
+                object obj = ResourceManager.GetObject("fire_layer_0", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap fire_layer_1 {
+            get {
+                object obj = ResourceManager.GetObject("fire_layer_1", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap gold {
+            get {
+                object obj = ResourceManager.GetObject("gold", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap iron {
+            get {
+                object obj = ResourceManager.GetObject("iron", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to {
         ///	&quot;COMMENT_1&quot;: &quot;Tile data research by MattNL&quot;,
@@ -498,5 +598,25 @@ namespace PckStudio.Core.Properties {
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap turtle {
+            get {
+                object obj = ResourceManager.GetObject("turtle", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap unknown_pack {
+            get {
+                object obj = ResourceManager.GetObject("unknown_pack", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
     }
 }
diff --git a/PckStudio.Core/Properties/Resources.resx b/PckStudio.Core/Properties/Resources.resx
index 8f34aa3e..e9483c24 100644
--- a/PckStudio.Core/Properties/Resources.resx
+++ b/PckStudio.Core/Properties/Resources.resx
@@ -133,9 +133,27 @@
   <data name="blockData" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\atlas\blockData.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;iso-8859-1</value>
   </data>
+  <data name="chain" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\armor\chain.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="clock" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\clock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="cloth" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\armor\cloth.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="cloth_b" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\armor\cloth_b.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="Comparison" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Comparison.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="compass" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\compass.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="diamond" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\armor\diamond.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="experienceOrbData" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\atlas\experienceOrbData.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;iso-8859-1</value>
   </data>
@@ -148,6 +166,18 @@
   <data name="explosions_atlas" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\atlas\explosion.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="fire_layer_0" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\fire_layer_0.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="fire_layer_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\fire_layer_1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="gold" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\armor\gold.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="iron" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\armor\iron.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="itemData" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\atlas\itemData.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;iso-8859-1</value>
   </data>
@@ -184,4 +214,10 @@
   <data name="TexturePackIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\TexturePackIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="turtle" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\armor\turtle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="unknown_pack" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\unknown_pack.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/PckStudio.Core/Resources/armor/chain.png b/PckStudio.Core/Resources/armor/chain.png
new file mode 100644
index 00000000..df912d1f
Binary files /dev/null and b/PckStudio.Core/Resources/armor/chain.png differ
diff --git a/PckStudio.Core/Resources/armor/cloth.png b/PckStudio.Core/Resources/armor/cloth.png
new file mode 100644
index 00000000..c213f695
Binary files /dev/null and b/PckStudio.Core/Resources/armor/cloth.png differ
diff --git a/PckStudio.Core/Resources/armor/cloth_b.png b/PckStudio.Core/Resources/armor/cloth_b.png
new file mode 100644
index 00000000..a99e346e
Binary files /dev/null and b/PckStudio.Core/Resources/armor/cloth_b.png differ
diff --git a/PckStudio.Core/Resources/armor/diamond.png b/PckStudio.Core/Resources/armor/diamond.png
new file mode 100644
index 00000000..509d21dd
Binary files /dev/null and b/PckStudio.Core/Resources/armor/diamond.png differ
diff --git a/PckStudio.Core/Resources/armor/gold.png b/PckStudio.Core/Resources/armor/gold.png
new file mode 100644
index 00000000..4c68f5fe
Binary files /dev/null and b/PckStudio.Core/Resources/armor/gold.png differ
diff --git a/PckStudio.Core/Resources/armor/iron.png b/PckStudio.Core/Resources/armor/iron.png
new file mode 100644
index 00000000..5f1b0f8c
Binary files /dev/null and b/PckStudio.Core/Resources/armor/iron.png differ
diff --git a/PckStudio.Core/Resources/armor/turtle.png b/PckStudio.Core/Resources/armor/turtle.png
new file mode 100644
index 00000000..6f392726
Binary files /dev/null and b/PckStudio.Core/Resources/armor/turtle.png differ
diff --git a/PckStudio.Core/Resources/clock.png b/PckStudio.Core/Resources/clock.png
new file mode 100644
index 00000000..069a0abf
Binary files /dev/null and b/PckStudio.Core/Resources/clock.png differ
diff --git a/PckStudio.Core/Resources/compass.png b/PckStudio.Core/Resources/compass.png
new file mode 100644
index 00000000..9dcbdfe6
Binary files /dev/null and b/PckStudio.Core/Resources/compass.png differ
diff --git a/PckStudio.Core/Resources/fire_layer_0.png b/PckStudio.Core/Resources/fire_layer_0.png
new file mode 100644
index 00000000..cf8910f6
Binary files /dev/null and b/PckStudio.Core/Resources/fire_layer_0.png differ
diff --git a/PckStudio.Core/Resources/fire_layer_1.png b/PckStudio.Core/Resources/fire_layer_1.png
new file mode 100644
index 00000000..6db92ac4
Binary files /dev/null and b/PckStudio.Core/Resources/fire_layer_1.png differ
diff --git a/PckStudio.Core/Resources/map_background.png b/PckStudio.Core/Resources/map_background.png
new file mode 100644
index 00000000..2783b501
Binary files /dev/null and b/PckStudio.Core/Resources/map_background.png differ
diff --git a/PckStudio.Core/Resources/normal.png b/PckStudio.Core/Resources/normal.png
index 2e3d7fde..ced4150e 100644
Binary files a/PckStudio.Core/Resources/normal.png and b/PckStudio.Core/Resources/normal.png differ
diff --git a/PckStudio.Core/Resources/unknown_pack.png b/PckStudio.Core/Resources/unknown_pack.png
new file mode 100644
index 00000000..16afadee
Binary files /dev/null and b/PckStudio.Core/Resources/unknown_pack.png differ