diff --git a/DynmapCore/src/main/java/org/dynmap/hdmap/renderer/GlowLichenStateRenderer.java b/DynmapCore/src/main/java/org/dynmap/hdmap/renderer/GlowLichenStateRenderer.java
new file mode 100644
index 00000000..ecf4b531
--- /dev/null
+++ b/DynmapCore/src/main/java/org/dynmap/hdmap/renderer/GlowLichenStateRenderer.java
@@ -0,0 +1,58 @@
+package org.dynmap.hdmap.renderer;
+
+import java.util.ArrayList;
+import java.util.BitSet;
+import java.util.Map;
+
+import org.dynmap.renderer.CustomRenderer;
+import org.dynmap.renderer.MapDataContext;
+import org.dynmap.renderer.RenderPatch;
+import org.dynmap.renderer.RenderPatchFactory;
+import org.dynmap.renderer.RenderPatchFactory.SideVisible;
+
+/*
+ * Glow lichen renderer for v1.17+
+ */
+public class GlowLichenStateRenderer extends CustomRenderer {
+    
+    // Meshes, indexed by state index (bit5=down, bit4=east, bit3=north, bit2=south, bit1=up, bit0=west)
+    protected RenderPatch[][] meshes = new RenderPatch[64][];
+    
+    @Override
+    public boolean initializeRenderer(RenderPatchFactory rpf, String blkname, BitSet blockdatamask, Map<String,String> custparm) {
+        if(!super.initializeRenderer(rpf, blkname, blockdatamask, custparm))
+            return false;
+        buildPatches(rpf);
+        return true;
+    }
+
+    private void buildPatches(RenderPatchFactory rpf) {
+        RenderPatch Top = rpf.getPatch(0.0, 0.95, 0.0, 1.0, 0.95, 0.0, 0.0, 0.95, 1.0, 0.0, 1.0, 0.0, 1.0, SideVisible.BOTH, 0);
+        RenderPatch Bottom = rpf.getPatch(0.0, 0.05, 0.0, 1.0, 0.05, 0.0, 0.0, 0.05, 1.0, 0.0, 1.0, 0.0, 1.0, SideVisible.BOTH, 0);
+        RenderPatch West = rpf.getPatch(0.05, 0.0, 0.0, 0.05, 0.0, 1.0, 0.05, 1.0, 0.0, 0.0, 1.0, 0.0, 1.0, SideVisible.BOTH, 0);
+        RenderPatch East = rpf.getPatch(0.95, 0.0, 0.0, 0.95, 0.0, 1.0, 0.95, 1.0, 0.0, 0.0, 1.0, 0.0, 1.0, SideVisible.BOTH, 0);
+        RenderPatch North = rpf.getPatch(0.0, 0.0, 0.05, 1.0, 0.0, 0.05, 0.0, 1.0, 0.05, 0.0, 1.0, 0.0, 1.0, SideVisible.BOTH, 0);
+        RenderPatch South = rpf.getPatch(0.0, 0.0, 0.95, 1.0, 0.0, 0.95, 0.0, 1.0, 0.95, 0.0, 1.0, 0.0, 1.0, SideVisible.BOTH, 0);
+        ArrayList<RenderPatch> list = new ArrayList<RenderPatch>();
+        for (int i = 0; i < 64; i++) {
+            list.clear();
+            if ((i & 0x20) == 0) list.add(Bottom);
+            if ((i & 0x10) == 0) list.add(East);
+            if ((i & 0x08) == 0) list.add(North);
+            if ((i & 0x04) == 0) list.add(South);
+            if ((i & 0x02) == 0) list.add(Top);
+            if ((i & 0x01) == 0) list.add(West);
+            meshes[i] = list.toArray(new RenderPatch[list.size()]);
+        }
+    }
+    @Override
+    public int getMaximumTextureCount() {
+        return 2;
+    }
+    
+    @Override
+    public RenderPatch[] getRenderPatchList(MapDataContext ctx) {
+    	int idx = ((ctx.getBlockType().stateIndex & 0x7C) >> 1) + (ctx.getBlockType().stateIndex & 0x1);	// Shift out waterlogged bit
+        return meshes[idx];
+    }    
+}
diff --git a/DynmapCore/src/main/resources/extracted/web/standalone/PostgreSQL_funcs.php b/DynmapCore/src/main/resources/extracted/web/standalone/PostgreSQL_funcs.php
index 08019635..51b4315c 100644
--- a/DynmapCore/src/main/resources/extracted/web/standalone/PostgreSQL_funcs.php
+++ b/DynmapCore/src/main/resources/extracted/web/standalone/PostgreSQL_funcs.php
@@ -69,10 +69,12 @@ function updateStandaloneFileByServerId($fname, $sid, $content) {
    global $db, $dbprefix;
    
    initDbIfNeeded();
-   $stmt = $db->prepare('UPDATE ' . $dbprefix . 'StandaloneFiles SET Content=? WHERE FileName=? AND ServerID=?');
-   $stmt->bind_param('ssi', $content, $fname, $sid);
+   $stmt = $db->prepare('UPDATE ' . $dbprefix . 'StandaloneFiles SET Content=:content WHERE FileName=:fname AND ServerID=:sid');
+   $stmt->bindParam(':content', $content, PDO::PARAM_STR);
+   $stmt->bindParam(':fname',   $fname,   PDO::PARAM_STR);
+   $stmt->bindParam(':sid',     $sid,     PDO::PARAM_INT);
    $res = $stmt->execute();
-   $stmt->close();
+   $stmt->closeCursor();
    if (!$res) {
       $res = insertStandaloneFileByServerId($fname, $sid, $content);
    }
diff --git a/DynmapCore/src/main/resources/models_1.txt b/DynmapCore/src/main/resources/models_1.txt
index 34a18f6d..ab46a112 100644
--- a/DynmapCore/src/main/resources/models_1.txt
+++ b/DynmapCore/src/main/resources/models_1.txt
@@ -1220,8 +1220,8 @@ customblock:id=purpur_stairs,class=org.dynmap.hdmap.renderer.StairStateRenderer
 # Beetroot
 patchblock:id=beetroots,patch0=VertX075,patch1=VertX075@90,patch2=VertX025,patch3=VertX025@90
 
-# Grass Path
-boxblock:id=grass_path,ymax=0.9375
+# Grass Path (replaced with dirt_path)
+[-1.16.5]boxblock:id=grass_path,ymax=0.9375
 
 # 209		End Gateway
 
@@ -1633,3 +1633,50 @@ patchblock:id=bubble_column
 # Polished Blackstone wall
 # Polished Blackstone Brick wall
 [1.16-]customblock:id=blackstone_wall,id=polished_blackstone_wall,id=polished_blackstone_brick_wall,class=org.dynmap.hdmap.renderer.FenceWallBlockStateRenderer,type=tallwall
+
+# 1.17
+# Dirt Path
+[1.17-]boxblock:id=dirt_path,ymax=0.9375
+# Cobbled deepslate stairs
+# Deepslate brick stairs
+# Deepslate tile stairs
+# Polished deepslate stairs
+# Cut copper stairs
+# Exposed cut copper stairs
+# Weathered cut copper stairs
+# Oxidized cut copper stairs
+# Waxed Cut copper stairs
+# Waxed Exposed cut copper stairs
+# Waxed Weathered cut copper stairs
+# Waxed Oxidized cut copper stairs
+[1.17-]customblock:id=cobbled_deepslate_stairs,id=deepslate_brick_stairs,id=deepslate_tile_stairs,id=polished_deepslate_stairs,id=cut_copper_stairs,id=oxidized_cut_copper_stairs,id=exposed_cut_copper_stairs,id=weathered_cut_copper_stairs,,id=waxed_cut_copper_stairs,id=waxed_oxidized_cut_copper_stairs,id=waxed_exposed_cut_copper_stairs,id=waxed_weathered_cut_copper_stairs,class=org.dynmap.hdmap.renderer.StairStateRenderer
+# Cobbled deepslate slab
+# Deepslate brick slab
+# Deepslate tile slab
+# Polished deepslate slab
+# Cut copper slab
+# Exposed cut copper slab
+# Weathered cut copper slab
+# Oxidized cut copper slab
+# Waxed cut copper slab
+# Waxed exposed cut copper slab
+# Waxed weathered cut copper slab
+# Waxed oxidized cut copper slab
+[1.17-]boxblock:id=cobbled_deepslate_slab,id=deepslate_brick_slab,id=deepslate_tile_slab,id=polished_deepslate_slab,id=cut_copper_slab,id=exposed_cut_copper_slab,id=weathered_cut_copper_slab,id=oxidized_cut_copper_slab,id=waxed_cut_copper_slab,id=waxed_exposed_cut_copper_slab,id=waxed_weathered_cut_copper_slab,id=waxed_oxidized_cut_copper_slab,data=0,data=1,ymin=0.5
+[1.17-]boxblock:id=cobbled_deepslate_slab,id=deepslate_brick_slab,id=deepslate_tile_slab,id=polished_deepslate_slab,id=cut_copper_slab,id=exposed_cut_copper_slab,id=weathered_cut_copper_slab,id=oxidized_cut_copper_slab,id=waxed_cut_copper_slab,id=waxed_exposed_cut_copper_slab,id=waxed_weathered_cut_copper_slab,id=waxed_oxidized_cut_copper_slab,data=2,data=3,ymax=0.5
+# Cobbled deepslate wall
+# Deepslate brick wall
+# Deepslate tile wall
+# Polished deepslate wall
+[1.17-]customblock:id=cobbled_deepslate_wall,id=deepslate_brick_wall,id=deepslate_tile_wall,id=polished_deepslate_wall,class=org.dynmap.hdmap.renderer.FenceWallBlockStateRenderer,type=tallwall
+# Glow lichens
+[1.17-]customblock:id=glow_lichen,class=org.dynmap.hdmap.renderer.GlowLichenStateRenderer
+# Cave vines
+# Cave vines plant
+# Hanging roots
+[1.17-]patchblock:id=cave_vines,id=cave_vines_plant,id=hanging_roots,patch0=VertX1Z0ToX0Z1,patch1=VertX1Z0ToX0Z1@90
+# Moss Carpet
+[1.17-]boxblock:id=moss_carpet,ymax=0.0625
+# Pointed dripstone
+[1.17-]patchblock:id=pointed_dripstone,patch0=VertX1Z0ToX0Z1,patch1=VertX1Z0ToX0Z1@90
+
diff --git a/DynmapCore/src/main/resources/texture_1.txt b/DynmapCore/src/main/resources/texture_1.txt
index d99b81a3..69ce7779 100644
--- a/DynmapCore/src/main/resources/texture_1.txt
+++ b/DynmapCore/src/main/resources/texture_1.txt
@@ -464,8 +464,8 @@ texture:id=beetroots_stage0
 texture:id=beetroots_stage1
 texture:id=beetroots_stage2
 texture:id=beetroots_stage3
-texture:id=grass_path_top
-texture:id=grass_path_side
+[-1.16.5]texture:id=grass_path_top
+[-1.16.5]texture:id=grass_path_side
 texture:id=command_block_back
 texture:id=command_block_front
 texture:id=command_block_side
@@ -1604,8 +1604,8 @@ block:id=beetroots,data=1,patch0-3=0:beetroots_stage1,transparency=TRANSPARENT
 block:id=beetroots,data=2,patch0-3=0:beetroots_stage2,transparency=TRANSPARENT
 block:id=beetroots,data=3,patch0-3=0:beetroots_stage3,transparency=TRANSPARENT
 
-# Grass Path
-block:id=grass_path,allsides=0:grass_path_side,top=0:grass_path_top,bottom=0:dirt,stdrot=true, transparency=TRANSPARENT
+# Grass Path (replaced with dirt path in 1.17
+[-1.16.5]block:id=grass_path,allsides=0:grass_path_side,top=0:grass_path_top,bottom=0:dirt,stdrot=true, transparency=TRANSPARENT
 
 # End Gateway
 block:id=end_gateway,data=*,stdrot=true,allfaces=0:endportal
@@ -2637,4 +2637,238 @@ block:id=horn_coral,patch0-1=0:horn_coral,transparency=TRANSPARENT
 # Quartz Bricks
 [1.16-]block:id=quartz_bricks,allfaces=0:quartz_bricks,stdrot=true
 
+# 1.17
+[1.17-]texture:id=dirt_path_top
+[1.17-]texture:id=dirt_path_side
+[1.17-]texture:id=deepslate
+[1.17-]texture:id=deepslate_top
+[1.17-]texture:id=deepslate_gold_ore
+[1.17-]texture:id=deepslate_iron_ore
+[1.17-]texture:id=deepslate_coal_ore
+[1.17-]texture:id=deepslate_lapis_ore
+[1.17-]texture:id=deepslate_diamond_ore
+[1.17-]texture:id=deepslate_redstone_ore
+[1.17-]texture:id=deepslate_emerald_ore
+[1.17-]texture:id=cobbled_deepslate
+[1.17-]texture:id=deepslate_bricks
+[1.17-]texture:id=deepslate_tiles
+[1.17-]texture:id=polished_deepslate
+[1.17-]texture:id=cracked_deepslate_bricks
+[1.17-]texture:id=cracked_deepslate_tiles
+[1.17-]texture:id=chiseled_deepslate
+[1.17-]texture:id=deepslate_copper_ore
+[1.17-]texture:id=azalea_leaves
+[1.17-]texture:id=flowering_azalea_leaves
+[1.17-]texture:id=glow_lichen
+[1.17-]texture:id=calcite
+[1.17-]texture:id=tinted_glass,material=GLASS
+[1.17-]texture:id=powder_snow
+[1.17-]texture:id=oxidized_copper
+[1.17-]texture:id=weathered_copper
+[1.17-]texture:id=exposed_copper
+[1.17-]texture:id=copper_block
+[1.17-]texture:id=copper_ore
+[1.17-]texture:id=oxidized_cut_copper
+[1.17-]texture:id=weathered_cut_copper
+[1.17-]texture:id=exposed_cut_copper
+[1.17-]texture:id=cut_copper
+[1.17-]texture:id=amethyst_block
+[1.17-]texture:id=rooted_dirt
+[1.17-]texture:id=smooth_basalt
+[1.17-]texture:id=raw_gold_block
+[1.17-]texture:id=raw_iron_block
+[1.17-]texture:id=raw_copper_block
+[1.17-]texture:id=cave_vines
+[1.17-]texture:id=cave_vines_lit
+[1.17-]texture:id=cave_vines_plant
+[1.17-]texture:id=cave_vines_plant_lit
+[1.17-]texture:id=moss_block
+[1.17-]texture:id=dripstone_block
+[1.17-]texture:id=hanging_roots
+[1.17-]texture:id=moss_carpet
+[1.17-]texture:id=tuff
+[1.17-]texture:id=pointed_dripstone_up_tip_merge
+[1.17-]texture:id=pointed_dripstone_down_tip_merge
+[1.17-]texture:id=pointed_dripstone_up_tip
+[1.17-]texture:id=pointed_dripstone_down_tip
+[1.17-]texture:id=pointed_dripstone_up_frustum
+[1.17-]texture:id=pointed_dripstone_down_frustum
+[1.17-]texture:id=pointed_dripstone_up_middle
+[1.17-]texture:id=pointed_dripstone_down_middle
+[1.17-]texture:id=pointed_dripstone_up_base
+[1.17-]texture:id=pointed_dripstone_down_base
+
+# Dirt path
+[1.17-]block:id=dirt_path,allsides=0:dirt_path_side,top=0:dirt_path_top,bottom=0:dirt,stdrot=true, transparency=TRANSPARENT
+# Deepslate
+[1.17-]block:id=deepslate,data=1,allsides=0:deepslate,topbottom=0:deepslate_top,stdrot=true
+[1.17-]block:id=deepslate,data=0,north=0:deepslate_top,south=0:deepslate_top,east=4000:deepslate,west=4000:deepslate,top=0:deepslate,bottom=0:deepslate
+[1.17-]block:id=deepslate,data=2,north=4000:deepslate,south=4000:deepslate,east=0:deepslate_top,west=0:deepslate_top,top=4000:deepslate,bottom=4000:deepslate
+# Deepslate gold ore
+[1.17-]block:id=deepslate_gold_ore,allfaces=0:deepslate_gold_ore,stdrot=true
+# Deepslate iron ore
+[1.17-]block:id=deepslate_iron_ore,allfaces=0:deepslate_iron_ore,stdrot=true
+# Deepslate coal ore
+[1.17-]block:id=deepslate_coal_ore,allfaces=0:deepslate_coal_ore,stdrot=true
+# Deepslate lapis ore
+[1.17-]block:id=deepslate_lapis_ore,allfaces=0:deepslate_lapis_ore,stdrot=true
+# Deepslate diamond ore
+[1.17-]block:id=deepslate_diamond_ore,allfaces=0:deepslate_diamond_ore,stdrot=true
+# Deepslate redstone ore
+[1.17-]block:id=deepslate_redstone_ore,allfaces=0:deepslate_redstone_ore,stdrot=true
+# Deepslate emerald ore
+[1.17-]block:id=deepslate_emerald_ore,allfaces=0:deepslate_emerald_ore,stdrot=true
+# Cobbled deepslate
+[1.17-]block:id=cobbled_deepslate,allfaces=0:cobbled_deepslate,stdrot=true
+# Cobbled deepslate stairs
+[1.17-]block:id=cobbled_deepslate_stairs,patch0-2=0:cobbled_deepslate,transparency=SEMITRANSPARENT
+# Cobbled deepslate slab
+[1.17-]block:id=cobbled_deepslate_slab,data=0,data=1,data=2,data=3,allfaces=0:cobbled_deepslate,stdrot=true,transparency=SEMITRANSPARENT
+[1.17-]block:id=cobbled_deepslate_slab,data=4,data=5,allfaces=0:cobbled_deepslate,stdrot=true
+# Cobbled deepslate wall
+[1.17-]block:id=cobbled_deepslate_wall,patch0-2=0:cobbled_deepslate,transparency=TRANSPARENT
+# Deepslate bricks
+[1.17-]block:id=deepslate_bricks,allfaces=0:deepslate_bricks,stdrot=true
+# Deepslate brick stairs
+[1.17-]block:id=deepslate_brick_stairs,patch0-2=0:deepslate_bricks,transparency=SEMITRANSPARENT
+# Deepslate brick slab
+[1.17-]block:id=deepslate_brick_slab,data=0,data=1,data=2,data=3,allfaces=0:deepslate_bricks,stdrot=true,transparency=SEMITRANSPARENT
+[1.17-]block:id=deepslate_brick_slab,data=4,data=5,allfaces=0:deepslate_bricks,stdrot=true
+# Deepslate brick wall
+[1.17-]block:id=deepslate_brick_wall,patch0-2=0:deepslate_bricks,transparency=TRANSPARENT
+# Deepslate tiles
+[1.17-]block:id=deepslate_tiles,allfaces=0:deepslate_tiles,stdrot=true
+# Deepslate tile stairs
+[1.17-]block:id=deepslate_tile_stairs,patch0-2=0:deepslate_tiles,transparency=SEMITRANSPARENT
+# Deepslate tile slab
+[1.17-]block:id=deepslate_tile_slab,data=0,data=1,data=2,data=3,allfaces=0:deepslate_tiles,stdrot=true,transparency=SEMITRANSPARENT
+[1.17-]block:id=deepslate_tile_slab,data=4,data=5,allfaces=0:deepslate_tiles,stdrot=true
+# Deepslate tile wall
+[1.17-]block:id=deepslate_tile_wall,patch0-2=0:deepslate_tiles,transparency=TRANSPARENT
+# Polished deepslate
+[1.17-]block:id=polished_deepslate,allfaces=0:polished_deepslate,stdrot=true
+# Polished deepslate stairs
+[1.17-]block:id=polished_deepslate_stairs,patch0-2=0:polished_deepslate,transparency=SEMITRANSPARENT
+# Polished deepslate slab
+[1.17-]block:id=polished_deepslate_slab,data=0,data=1,data=2,data=3,allfaces=0:polished_deepslate,stdrot=true,transparency=SEMITRANSPARENT
+[1.17-]block:id=polished_deepslate_slab,data=4,data=5,allfaces=0:polished_deepslate,stdrot=true
+# Polished deepslate wall
+[1.17-]block:id=polished_deepslate_wall,patch0-2=0:polished_deepslate,transparency=TRANSPARENT
+# Cracked deepslate tiles
+[1.17-]block:id=cracked_deepslate_tiles,allfaces=0:cracked_deepslate_tiles,stdrot=true
+# Cracked deepslate bricks
+[1.17-]block:id=cracked_deepslate_bricks,allfaces=0:cracked_deepslate_bricks,stdrot=true
+# Infested deepslate
+[1.17-]block:id=infested_deepslate,data=1,allsides=0:deepslate,topbottom=0:deepslate_top,stdrot=true
+[1.17-]block:id=infested_deepslate,data=0,north=0:deepslate_top,south=0:deepslate_top,east=4000:deepslate,west=4000:deepslate,top=0:deepslate,bottom=0:deepslate
+[1.17-]block:id=infested_deepslate,data=2,north=4000:deepslate,south=4000:deepslate,east=0:deepslate_top,west=0:deepslate_top,top=4000:deepslate,bottom=4000:deepslate
+# Chiseled deepslate
+[1.17-]block:id=chiseled_deepslate,allfaces=0:chiseled_deepslate,stdrot=true
+# Deepslate copper ore
+[1.17-]block:id=deepslate_copper_ore,allfaces=0:deepslate_copper_ore,stdrot=true
+# Leaves (azalea)
+[1.17-]block:id=azalea_leaves,allfaces=2000:azalea_leaves,stdrot=true,transparency=LEAVES
+# Leaves (flowering azalea)
+[1.17-]block:id=flowering_azalea_leaves,allfaces=2000:flowering_azalea_leaves,stdrot=true,transparency=LEAVES
+# Glow lichens
+[1.17-]block:id=glow_lichen,patch0-4=0:glow_lichen,transparency=TRANSPARENT
+# Calcite
+[1.17-]block:id=calcite,allfaces=0:calcite,stdrot=true
+# Tinted Glass
+[1.17-]block:id=tinted_glass,allfaces=12000:tinted_glass,stdrot=true,transparency=TRANSPARENT
+# Powder snow
+[1.17-]block:id=powder_snow,allfaces=0:powder_snow,stdrot=true
+# Oxidized copper
+# Waxed oxidized copper
+[1.17-]block:id=oxidized_copper,id=waxed_oxidized_copper,allfaces=0:oxidized_copper,stdrot=true
+# Weathered copper
+# Waxed wathered copper
+[1.17-]block:id=weathered_copper,id=waxed_weathered_copper,allfaces=0:weathered_copper,stdrot=true
+# Exposed copper
+# Waxed exposed copper
+[1.17-]block:id=exposed_copper,id=waxed_exposed_copper,allfaces=0:exposed_copper,stdrot=true
+# Copper block
+# Waxed copper block
+[1.17-]block:id=copper_block,id=waxed_copper_block,allfaces=0:copper_block,stdrot=true
+# Copper ore
+[1.17-]block:id=copper_ore,allfaces=0:copper_ore,stdrot=true
+# Oxidized cut copper
+# Waxed oxidized cut copper
+[1.17-]block:id=oxidized_cut_copper,id=waxed_oxidized_cut_copper,allfaces=0:oxidized_cut_copper,stdrot=true
+# Weathered cut copper
+# Waxed weathered cut copper
+[1.17-]block:id=weathered_cut_copper,id=waxed_weathered_cut_copper,allfaces=0:weathered_cut_copper,stdrot=true
+# Exposed cut copper
+# Waxed exposed cut copper
+[1.17-]block:id=exposed_cut_copper,id=waxed_exposed_cut_copper,allfaces=0:exposed_cut_copper,stdrot=true
+# Cut copper
+# Waxed cut copper
+[1.17-]block:id=cut_copper,id=waxed_cut_copper,allfaces=0:cut_copper,stdrot=true
+# Cut copper stairs
+# Waxed cut copper stairs
+[1.17-]block:id=cut_copper_stairs,id=waxed_cut_copper_stairs,patch0-2=0:cut_copper,transparency=SEMITRANSPARENT
+# Cut copper slab
+# Waxed cut copper slab
+[1.17-]block:id=cut_copper_slab,id=waxed_cut_copper_slab,data=0,data=1,data=2,data=3,allfaces=0:cut_copper,stdrot=true,transparency=SEMITRANSPARENT
+[1.17-]block:id=cut_copper_slab,id=waxed_cut_copper_slab,data=4,data=5,allfaces=0:cut_copper,stdrot=true
+# Exposed cut copper stairs
+# Waxed exposed cut copper stairs
+[1.17-]block:id=exposed_cut_copper_stairs,id=waxed_exposed_cut_copper_stairs,patch0-2=0:exposed_cut_copper,transparency=SEMITRANSPARENT
+# Exposed cut copper slab
+# Waxed exposed cut copper slab
+[1.17-]block:id=exposed_cut_copper_slab,id=waxed_exposed_cut_copper_slab,data=0,data=1,data=2,data=3,allfaces=0:exposed_cut_copper,stdrot=true,transparency=SEMITRANSPARENT
+[1.17-]block:id=exposed_cut_copper_slab,id=waxed_exposed_cut_copper_slab,data=4,data=5,allfaces=0:exposed_cut_copper,stdrot=true
+# Weathered cut copper stairs
+# Waxed weathered cut copper stairs
+[1.17-]block:id=weathered_cut_copper_stairs,id=waxed_weathered_cut_copper_stairs,patch0-2=0:weathered_cut_copper,transparency=SEMITRANSPARENT
+# Weathered cut copper slab
+# Waxed weathered cut copper slab
+[1.17-]block:id=weathered_cut_copper_slab,id=waxed_weathered_cut_copper_slab,data=0,data=1,data=2,data=3,allfaces=0:weathered_cut_copper,stdrot=true,transparency=SEMITRANSPARENT
+[1.17-]block:id=weathered_cut_copper_slab,id=waxed_weathered_cut_copper_slab,data=4,data=5,allfaces=0:weathered_cut_copper,stdrot=true
+# Oxidized cut copper stairs
+# Waxed oxidized cut copper stairs
+[1.17-]block:id=oxidized_cut_copper_stairs,id=waxed_oxidized_cut_copper_stairs,patch0-2=0:oxidized_cut_copper,transparency=SEMITRANSPARENT
+# Oxidized cut copper slab
+# Waxed oxidized cut copper slab
+[1.17-]block:id=oxidized_cut_copper_slab,id=waxed_oxidized_cut_copper_slab,data=0,data=1,data=2,data=3,allfaces=0:oxidized_cut_copper,stdrot=true,transparency=SEMITRANSPARENT
+[1.17-]block:id=oxidized_cut_copper_slab,id=waxed_oxidized_cut_copper_slab,data=4,data=5,allfaces=0:oxidized_cut_copper,stdrot=true
+# Amethyst block
+[1.17-]block:id=amethyst_block,allfaces=0:amethyst_block,stdrot=true
+# Rooted dirt
+[1.17-]block:id=rooted_dirt,allfaces=0:rooted_dirt,stdrot=true
+# Smooth basalt
+[1.17-]block:id=smooth_basalt,allfaces=0:smooth_basalt,stdrot=true
+# Raw iron block
+[1.17-]block:id=raw_iron_block,allfaces=0:raw_iron_block,stdrot=true
+# Raw gold block
+[1.17-]block:id=raw_gold_block,allfaces=0:raw_gold_block,stdrot=true
+# Raw copper block
+[1.17-]block:id=raw_copper_block,allfaces=0:raw_copper_block,stdrot=true
+# Cave vines
+[1.17-]block:id=cave_vines,data=0,data=2,data=4,data=6,data=8,data=10,data=12,data=14,data=16,data=18,data=20,data=22,data=24,data=26,data=28,data=30,data=32,data=34,data=36,data=38,data=40,data=42,data=44,data=46,data=48,data=50,patch0-1=0:cave_vines_lit,transparency=TRANSPARENT
+[1.17-]block:id=cave_vines,data=1,data=3,data=5,data=7,data=9,data=11,data=13,data=15,data=17,data=19,data=21,data=23,data=25,data=27,data=29,data=31,data=33,data=35,data=37,data=39,data=41,data=43,data=45,data=47,data=49,data=51,patch0-1=0:cave_vines,transparency=TRANSPARENT
+# Cave vines plant
+[1.17-]block:id=cave_vines_plant,data=0,patch0-1=0:cave_vines_plant_lit,transparency=TRANSPARENT
+[1.17-]block:id=cave_vines_plant,data=1,patch0-1=0:cave_vines_plant,transparency=TRANSPARENT
+# Moss block
+[1.17-]block:id=moss_block,allfaces=0:moss_block,stdrot=true
+# Dripstone block
+[1.17-]block:id=dripstone_block,allfaces=0:dripstone_block,stdrot=true
+# Hanging roots
+[1.17-]block:id=hanging_roots,patch0-1=0:hanging_roots,transparency=TRANSPARENT
+# Moss Carpet
+[1.17-]block:id=moss_carpet,stdrot=true,allfaces=0:moss_carpet
+# Tuff
+[1.17-]block:id=tuff,allfaces=0:tuff,stdrot=true
+# Pointed dripstone
+[1.17-]block:id=pointed_dripstone,data=0,data=1,patch0-1=0:pointed_dripstone_up_tip_merge,transparency=TRANSPARENT
+[1.17-]block:id=pointed_dripstone,data=2,data=3,patch0-1=0:pointed_dripstone_down_tip_merge,transparency=TRANSPARENT
+[1.17-]block:id=pointed_dripstone,data=4,data=5,patch0-1=0:pointed_dripstone_up_tip,transparency=TRANSPARENT
+[1.17-]block:id=pointed_dripstone,data=6,data=7,patch0-1=0:pointed_dripstone_down_tip,transparency=TRANSPARENT
+[1.17-]block:id=pointed_dripstone,data=8,data=9,patch0-1=0:pointed_dripstone_up_frustum,transparency=TRANSPARENT
+[1.17-]block:id=pointed_dripstone,data=10,data=11,patch0-1=0:pointed_dripstone_down_frustum,transparency=TRANSPARENT
+[1.17-]block:id=pointed_dripstone,data=12,data=13,patch0-1=0:pointed_dripstone_up_middle,transparency=TRANSPARENT
+[1.17-]block:id=pointed_dripstone,data=14,data=15,patch0-1=0:pointed_dripstone_down_middle,transparency=TRANSPARENT
+[1.17-]block:id=pointed_dripstone,data=16,data=17,patch0-1=0:pointed_dripstone_up_base,transparency=TRANSPARENT
+[1.17-]block:id=pointed_dripstone,data=18,data=19,patch0-1=0:pointed_dripstone_down_base,transparency=TRANSPARENT
 
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/amethyst_block.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/amethyst_block.png
new file mode 100644
index 00000000..4e3e8b16
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/amethyst_block.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/amethyst_cluster.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/amethyst_cluster.png
new file mode 100644
index 00000000..c928f204
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/amethyst_cluster.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/ancient_debris_side.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/ancient_debris_side.png
index ee2d0dd2..1d3519ee 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/ancient_debris_side.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/ancient_debris_side.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/ancient_debris_top.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/ancient_debris_top.png
index 3893cddc..133819d5 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/ancient_debris_top.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/ancient_debris_top.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/azalea_leaves.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/azalea_leaves.png
new file mode 100644
index 00000000..7eff9b1d
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/azalea_leaves.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/azalea_plant.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/azalea_plant.png
new file mode 100644
index 00000000..74d5a97e
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/azalea_plant.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/azalea_side.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/azalea_side.png
new file mode 100644
index 00000000..43b8ec06
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/azalea_side.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/azalea_top.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/azalea_top.png
new file mode 100644
index 00000000..0449fb01
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/azalea_top.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/big_dripleaf_side.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/big_dripleaf_side.png
new file mode 100644
index 00000000..f596e329
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/big_dripleaf_side.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/big_dripleaf_stem.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/big_dripleaf_stem.png
new file mode 100644
index 00000000..56b1aee5
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/big_dripleaf_stem.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/big_dripleaf_tip.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/big_dripleaf_tip.png
new file mode 100644
index 00000000..5f42e9a9
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/big_dripleaf_tip.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/big_dripleaf_top.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/big_dripleaf_top.png
new file mode 100644
index 00000000..f6974840
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/big_dripleaf_top.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/black_candle.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/black_candle.png
new file mode 100644
index 00000000..35f51945
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/black_candle.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/black_candle_lit.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/black_candle_lit.png
new file mode 100644
index 00000000..2977e0a8
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/black_candle_lit.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/blackstone.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/blackstone.png
index 265aa349..5f94c21e 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/blackstone.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/blackstone.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/blue_candle.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/blue_candle.png
new file mode 100644
index 00000000..96f1bac6
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/blue_candle.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/blue_candle_lit.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/blue_candle_lit.png
new file mode 100644
index 00000000..2f188667
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/blue_candle_lit.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/brown_candle.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/brown_candle.png
new file mode 100644
index 00000000..19368dce
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/brown_candle.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/brown_candle_lit.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/brown_candle_lit.png
new file mode 100644
index 00000000..11cf40c0
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/brown_candle_lit.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/budding_amethyst.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/budding_amethyst.png
new file mode 100644
index 00000000..edde8057
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/budding_amethyst.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/calcite.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/calcite.png
new file mode 100644
index 00000000..4c2b0dd9
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/calcite.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/candle.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/candle.png
new file mode 100644
index 00000000..d11559b6
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/candle.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/candle_lit.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/candle_lit.png
new file mode 100644
index 00000000..9aa011e0
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/candle_lit.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/cave_vines.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/cave_vines.png
new file mode 100644
index 00000000..335940e2
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/cave_vines.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/cave_vines_lit.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/cave_vines_lit.png
new file mode 100644
index 00000000..19692215
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/cave_vines_lit.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/cave_vines_plant.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/cave_vines_plant.png
new file mode 100644
index 00000000..47a43633
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/cave_vines_plant.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/cave_vines_plant_lit.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/cave_vines_plant_lit.png
new file mode 100644
index 00000000..8eee4373
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/cave_vines_plant_lit.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/chiseled_deepslate.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/chiseled_deepslate.png
new file mode 100644
index 00000000..b8a7014a
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/chiseled_deepslate.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/coal_ore.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/coal_ore.png
index 3759e02e..2a21d2bd 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/coal_ore.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/coal_ore.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/cobbled_deepslate.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/cobbled_deepslate.png
new file mode 100644
index 00000000..50fe34e4
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/cobbled_deepslate.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/copper_block.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/copper_block.png
new file mode 100644
index 00000000..f7ce8b42
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/copper_block.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/copper_ore.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/copper_ore.png
new file mode 100644
index 00000000..c7aea0c0
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/copper_ore.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/cracked_deepslate_bricks.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/cracked_deepslate_bricks.png
new file mode 100644
index 00000000..7f8f8332
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/cracked_deepslate_bricks.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/cracked_deepslate_tiles.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/cracked_deepslate_tiles.png
new file mode 100644
index 00000000..b17d116e
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/cracked_deepslate_tiles.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/cracked_polished_blackstone_bricks.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/cracked_polished_blackstone_bricks.png
index 7a1179fc..fa5b7e64 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/cracked_polished_blackstone_bricks.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/cracked_polished_blackstone_bricks.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/crafting_table_front.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/crafting_table_front.png
index 49b1c031..5bdd5d42 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/crafting_table_front.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/crafting_table_front.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/crafting_table_side.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/crafting_table_side.png
index b6dead51..022edff5 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/crafting_table_side.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/crafting_table_side.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/crimson_roots_pot.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/crimson_roots_pot.png
index 9ffad62a..461b6694 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/crimson_roots_pot.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/crimson_roots_pot.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/crying_obsidian.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/crying_obsidian.png
index 1ec4b2c6..df10b446 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/crying_obsidian.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/crying_obsidian.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/cut_copper.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/cut_copper.png
new file mode 100644
index 00000000..cdb7f238
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/cut_copper.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/cyan_candle.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/cyan_candle.png
new file mode 100644
index 00000000..ab18f4fa
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/cyan_candle.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/cyan_candle_lit.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/cyan_candle_lit.png
new file mode 100644
index 00000000..51e9c30d
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/cyan_candle_lit.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/deepslate.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/deepslate.png
new file mode 100644
index 00000000..b07b09d5
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/deepslate.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/deepslate_bricks.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/deepslate_bricks.png
new file mode 100644
index 00000000..2cf2a171
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/deepslate_bricks.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/deepslate_coal_ore.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/deepslate_coal_ore.png
new file mode 100644
index 00000000..3b9768c0
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/deepslate_coal_ore.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/deepslate_copper_ore.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/deepslate_copper_ore.png
new file mode 100644
index 00000000..6dc547de
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/deepslate_copper_ore.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/deepslate_diamond_ore.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/deepslate_diamond_ore.png
new file mode 100644
index 00000000..86772d02
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/deepslate_diamond_ore.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/deepslate_emerald_ore.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/deepslate_emerald_ore.png
new file mode 100644
index 00000000..31720fda
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/deepslate_emerald_ore.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/deepslate_gold_ore.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/deepslate_gold_ore.png
new file mode 100644
index 00000000..be52acbe
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/deepslate_gold_ore.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/deepslate_iron_ore.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/deepslate_iron_ore.png
new file mode 100644
index 00000000..96c170ee
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/deepslate_iron_ore.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/deepslate_lapis_ore.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/deepslate_lapis_ore.png
new file mode 100644
index 00000000..0e9c8cce
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/deepslate_lapis_ore.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/deepslate_redstone_ore.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/deepslate_redstone_ore.png
new file mode 100644
index 00000000..6a1419a8
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/deepslate_redstone_ore.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/deepslate_tiles.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/deepslate_tiles.png
new file mode 100644
index 00000000..7eebeb66
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/deepslate_tiles.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/deepslate_top.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/deepslate_top.png
new file mode 100644
index 00000000..2569e507
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/deepslate_top.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/diamond_ore.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/diamond_ore.png
index 1f467c6c..5182e1cd 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/diamond_ore.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/diamond_ore.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dirt_path_side.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dirt_path_side.png
new file mode 100644
index 00000000..c9de1352
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dirt_path_side.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dirt_path_top.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dirt_path_top.png
new file mode 100644
index 00000000..86c0a4c3
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dirt_path_top.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dripstone_block.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dripstone_block.png
new file mode 100644
index 00000000..c3fbb5b4
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dripstone_block.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/emerald_ore.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/emerald_ore.png
index aad451a8..425191c4 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/emerald_ore.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/emerald_ore.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/exposed_copper.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/exposed_copper.png
new file mode 100644
index 00000000..d265f4bf
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/exposed_copper.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/exposed_cut_copper.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/exposed_cut_copper.png
new file mode 100644
index 00000000..b8d527c7
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/exposed_cut_copper.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/flowering_azalea_leaves.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/flowering_azalea_leaves.png
new file mode 100644
index 00000000..2de12a36
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/flowering_azalea_leaves.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/flowering_azalea_side.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/flowering_azalea_side.png
new file mode 100644
index 00000000..c61e5166
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/flowering_azalea_side.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/flowering_azalea_top.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/flowering_azalea_top.png
new file mode 100644
index 00000000..921bb8f9
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/flowering_azalea_top.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/gilded_blackstone.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/gilded_blackstone.png
index 0d9bd767..db5c6163 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/gilded_blackstone.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/gilded_blackstone.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/glow_item_frame.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/glow_item_frame.png
new file mode 100644
index 00000000..633e5674
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/glow_item_frame.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/glow_lichen.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/glow_lichen.png
new file mode 100644
index 00000000..d6fd8702
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/glow_lichen.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/gold_ore.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/gold_ore.png
index eb31b55f..cb1c9cc6 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/gold_ore.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/gold_ore.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/grass_block_snow.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/grass_block_snow.png
index 5dd9e4b7..5fe3e029 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/grass_block_snow.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/grass_block_snow.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/gray_candle.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/gray_candle.png
new file mode 100644
index 00000000..5af00c77
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/gray_candle.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/gray_candle_lit.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/gray_candle_lit.png
new file mode 100644
index 00000000..b95b6f66
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/gray_candle_lit.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/green_candle.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/green_candle.png
new file mode 100644
index 00000000..5afa6955
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/green_candle.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/green_candle_lit.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/green_candle_lit.png
new file mode 100644
index 00000000..e7e621ca
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/green_candle_lit.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/green_concrete_powder.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/green_concrete_powder.png
index c3c78ec9..cdeef44b 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/green_concrete_powder.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/green_concrete_powder.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/hanging_roots.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/hanging_roots.png
new file mode 100644
index 00000000..5aae89e6
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/hanging_roots.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/iron_ore.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/iron_ore.png
index 9364ddde..8fa68577 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/iron_ore.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/iron_ore.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/lapis_ore.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/lapis_ore.png
index b95e637e..7c212c3e 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/lapis_ore.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/lapis_ore.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/large_amethyst_bud.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/large_amethyst_bud.png
new file mode 100644
index 00000000..337f13d5
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/large_amethyst_bud.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/light_blue_candle.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/light_blue_candle.png
new file mode 100644
index 00000000..1c6cb847
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/light_blue_candle.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/light_blue_candle_lit.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/light_blue_candle_lit.png
new file mode 100644
index 00000000..56bc7ccd
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/light_blue_candle_lit.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/light_gray_candle.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/light_gray_candle.png
new file mode 100644
index 00000000..4704ceb8
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/light_gray_candle.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/light_gray_candle_lit.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/light_gray_candle_lit.png
new file mode 100644
index 00000000..9b8981f0
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/light_gray_candle_lit.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/lightning_rod.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/lightning_rod.png
new file mode 100644
index 00000000..5c9a13d7
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/lightning_rod.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/lightning_rod_on.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/lightning_rod_on.png
new file mode 100644
index 00000000..a380d686
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/lightning_rod_on.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/lime_candle.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/lime_candle.png
new file mode 100644
index 00000000..03defb4a
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/lime_candle.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/lime_candle_lit.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/lime_candle_lit.png
new file mode 100644
index 00000000..7431d4b8
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/lime_candle_lit.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/loom_front.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/loom_front.png
index c53ab778..e2541b1f 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/loom_front.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/loom_front.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/magenta_candle.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/magenta_candle.png
new file mode 100644
index 00000000..dd7c958f
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/magenta_candle.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/magenta_candle_lit.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/magenta_candle_lit.png
new file mode 100644
index 00000000..340c04d1
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/magenta_candle_lit.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/medium_amethyst_bud.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/medium_amethyst_bud.png
new file mode 100644
index 00000000..a0f84f0d
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/medium_amethyst_bud.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/moss_block.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/moss_block.png
new file mode 100644
index 00000000..c949c37c
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/moss_block.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/nether_wart_block.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/nether_wart_block.png
index a71d0898..fee89b53 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/nether_wart_block.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/nether_wart_block.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/nether_wart_stage2.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/nether_wart_stage2.png
index b3d724bb..3ea9b666 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/nether_wart_stage2.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/nether_wart_stage2.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/netherite_block.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/netherite_block.png
index 60957f01..fa929178 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/netherite_block.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/netherite_block.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/observer_back_on.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/observer_back_on.png
index 4957e0c0..07a42a95 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/observer_back_on.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/observer_back_on.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/orange_candle.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/orange_candle.png
new file mode 100644
index 00000000..bed564ad
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/orange_candle.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/orange_candle_lit.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/orange_candle_lit.png
new file mode 100644
index 00000000..3a7ec6f7
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/orange_candle_lit.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/oxidized_copper.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/oxidized_copper.png
new file mode 100644
index 00000000..0ad69bc9
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/oxidized_copper.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/oxidized_cut_copper.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/oxidized_cut_copper.png
new file mode 100644
index 00000000..7da2ce3e
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/oxidized_cut_copper.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/pink_candle.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/pink_candle.png
new file mode 100644
index 00000000..e496990c
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/pink_candle.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/pink_candle_lit.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/pink_candle_lit.png
new file mode 100644
index 00000000..75c95e94
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/pink_candle_lit.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/pointed_dripstone_down_base.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/pointed_dripstone_down_base.png
new file mode 100644
index 00000000..b3d97cbe
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/pointed_dripstone_down_base.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/pointed_dripstone_down_frustum.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/pointed_dripstone_down_frustum.png
new file mode 100644
index 00000000..1cd45158
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/pointed_dripstone_down_frustum.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/pointed_dripstone_down_middle.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/pointed_dripstone_down_middle.png
new file mode 100644
index 00000000..f49ffd3d
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/pointed_dripstone_down_middle.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/pointed_dripstone_down_tip.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/pointed_dripstone_down_tip.png
new file mode 100644
index 00000000..91f73b37
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/pointed_dripstone_down_tip.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/pointed_dripstone_down_tip_merge.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/pointed_dripstone_down_tip_merge.png
new file mode 100644
index 00000000..38620f50
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/pointed_dripstone_down_tip_merge.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/pointed_dripstone_up_base.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/pointed_dripstone_up_base.png
new file mode 100644
index 00000000..86e7f403
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/pointed_dripstone_up_base.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/pointed_dripstone_up_frustum.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/pointed_dripstone_up_frustum.png
new file mode 100644
index 00000000..e90a9f41
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/pointed_dripstone_up_frustum.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/pointed_dripstone_up_middle.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/pointed_dripstone_up_middle.png
new file mode 100644
index 00000000..eb66e9b7
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/pointed_dripstone_up_middle.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/pointed_dripstone_up_tip.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/pointed_dripstone_up_tip.png
new file mode 100644
index 00000000..9c702a73
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/pointed_dripstone_up_tip.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/pointed_dripstone_up_tip_merge.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/pointed_dripstone_up_tip_merge.png
new file mode 100644
index 00000000..0cb03adf
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/pointed_dripstone_up_tip_merge.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/polished_blackstone_bricks.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/polished_blackstone_bricks.png
index c89564f2..46b67340 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/polished_blackstone_bricks.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/polished_blackstone_bricks.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/polished_deepslate.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/polished_deepslate.png
new file mode 100644
index 00000000..dfcf7501
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/polished_deepslate.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/potted_azalea_bush_plant.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/potted_azalea_bush_plant.png
new file mode 100644
index 00000000..2eccc7a9
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/potted_azalea_bush_plant.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/potted_azalea_bush_side.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/potted_azalea_bush_side.png
new file mode 100644
index 00000000..3b8c9ea0
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/potted_azalea_bush_side.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/potted_azalea_bush_top.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/potted_azalea_bush_top.png
new file mode 100644
index 00000000..cc78fdaa
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/potted_azalea_bush_top.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/potted_flowering_azalea_bush_plant.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/potted_flowering_azalea_bush_plant.png
new file mode 100644
index 00000000..38d91486
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/potted_flowering_azalea_bush_plant.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/potted_flowering_azalea_bush_side.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/potted_flowering_azalea_bush_side.png
new file mode 100644
index 00000000..6baabec4
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/potted_flowering_azalea_bush_side.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/potted_flowering_azalea_bush_top.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/potted_flowering_azalea_bush_top.png
new file mode 100644
index 00000000..eb47df64
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/potted_flowering_azalea_bush_top.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/powder_snow.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/powder_snow.png
new file mode 100644
index 00000000..f6c22793
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/powder_snow.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/pumpkin_top.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/pumpkin_top.png
index 59a5fbd0..56146c52 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/pumpkin_top.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/pumpkin_top.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/purple_candle.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/purple_candle.png
new file mode 100644
index 00000000..a26d4612
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/purple_candle.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/purple_candle_lit.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/purple_candle_lit.png
new file mode 100644
index 00000000..7b0bc374
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/purple_candle_lit.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/purpur_pillar_top.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/purpur_pillar_top.png
index 2502aed5..6209035c 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/purpur_pillar_top.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/purpur_pillar_top.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/raw_copper_block.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/raw_copper_block.png
new file mode 100644
index 00000000..91101426
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/raw_copper_block.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/raw_gold_block.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/raw_gold_block.png
new file mode 100644
index 00000000..ba155c4b
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/raw_gold_block.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/raw_iron_block.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/raw_iron_block.png
new file mode 100644
index 00000000..3b34f86c
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/raw_iron_block.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/red_candle.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/red_candle.png
new file mode 100644
index 00000000..92d22163
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/red_candle.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/red_candle_lit.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/red_candle_lit.png
new file mode 100644
index 00000000..edf35cbd
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/red_candle_lit.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/redstone_ore.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/redstone_ore.png
index 7e696c15..b7086970 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/redstone_ore.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/redstone_ore.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/rooted_dirt.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/rooted_dirt.png
new file mode 100644
index 00000000..b28f0a32
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/rooted_dirt.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/sculk_sensor_bottom.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/sculk_sensor_bottom.png
new file mode 100644
index 00000000..a3bf18fe
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/sculk_sensor_bottom.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/sculk_sensor_side.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/sculk_sensor_side.png
new file mode 100644
index 00000000..e26bf900
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/sculk_sensor_side.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/sculk_sensor_tendril_active.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/sculk_sensor_tendril_active.png
new file mode 100644
index 00000000..16ce1977
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/sculk_sensor_tendril_active.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/sculk_sensor_tendril_active.png.mcmeta b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/sculk_sensor_tendril_active.png.mcmeta
new file mode 100644
index 00000000..d1cd0799
--- /dev/null
+++ b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/sculk_sensor_tendril_active.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "animation": {
+        "frametime": 1
+    }
+}
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/sculk_sensor_tendril_inactive.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/sculk_sensor_tendril_inactive.png
new file mode 100644
index 00000000..01535653
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/sculk_sensor_tendril_inactive.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/sculk_sensor_tendril_inactive.png.mcmeta b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/sculk_sensor_tendril_inactive.png.mcmeta
new file mode 100644
index 00000000..36578bcc
--- /dev/null
+++ b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/sculk_sensor_tendril_inactive.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "animation": {
+        "frametime": 2
+    }
+}
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/sculk_sensor_top.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/sculk_sensor_top.png
new file mode 100644
index 00000000..f178c12b
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/sculk_sensor_top.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/small_amethyst_bud.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/small_amethyst_bud.png
new file mode 100644
index 00000000..443c2d22
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/small_amethyst_bud.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/small_dripleaf_side.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/small_dripleaf_side.png
new file mode 100644
index 00000000..28b09da6
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/small_dripleaf_side.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/small_dripleaf_stem_bottom.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/small_dripleaf_stem_bottom.png
new file mode 100644
index 00000000..5a3b9e68
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/small_dripleaf_stem_bottom.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/small_dripleaf_stem_top.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/small_dripleaf_stem_top.png
new file mode 100644
index 00000000..596a02cd
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/small_dripleaf_stem_top.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/small_dripleaf_top.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/small_dripleaf_top.png
new file mode 100644
index 00000000..34efa1fc
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/small_dripleaf_top.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/smoker_top.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/smoker_top.png
index ff687df9..4b5e2807 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/smoker_top.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/smoker_top.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/smooth_basalt.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/smooth_basalt.png
new file mode 100644
index 00000000..56daac94
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/smooth_basalt.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/soul_fire_0.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/soul_fire_0.png
index 32f1c97b..5fb04179 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/soul_fire_0.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/soul_fire_0.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/soul_fire_1.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/soul_fire_1.png
index f90a8d46..8d441370 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/soul_fire_1.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/soul_fire_1.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/soul_lantern.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/soul_lantern.png
index 6e909f20..7321c1bd 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/soul_lantern.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/soul_lantern.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/spore_blossom.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/spore_blossom.png
new file mode 100644
index 00000000..164bd293
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/spore_blossom.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/spore_blossom_base.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/spore_blossom_base.png
new file mode 100644
index 00000000..5edd86bf
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/spore_blossom_base.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/target_side.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/target_side.png
index 372cded4..f28d412b 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/target_side.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/target_side.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/target_top.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/target_top.png
index 63463fc4..8d8bc74f 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/target_top.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/target_top.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/tinted_glass.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/tinted_glass.png
new file mode 100644
index 00000000..cd1dd46e
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/tinted_glass.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/tuff.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/tuff.png
new file mode 100644
index 00000000..08804335
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/tuff.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/warped_roots_pot.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/warped_roots_pot.png
index 3aa4becb..48736748 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/warped_roots_pot.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/warped_roots_pot.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/water_overlay.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/water_overlay.png
index c0e38976..c6f2fa98 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/water_overlay.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/water_overlay.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/weathered_copper.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/weathered_copper.png
new file mode 100644
index 00000000..10d24e11
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/weathered_copper.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/weathered_cut_copper.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/weathered_cut_copper.png
new file mode 100644
index 00000000..8d9ed405
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/weathered_cut_copper.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/wheat_stage0.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/wheat_stage0.png
index a4ce8263..a931be80 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/wheat_stage0.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/wheat_stage0.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/wheat_stage1.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/wheat_stage1.png
index a9a4517c..e2fde9e8 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/wheat_stage1.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/wheat_stage1.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/white_candle.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/white_candle.png
new file mode 100644
index 00000000..27924380
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/white_candle.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/white_candle_lit.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/white_candle_lit.png
new file mode 100644
index 00000000..1ad1ae42
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/white_candle_lit.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/yellow_candle.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/yellow_candle.png
new file mode 100644
index 00000000..e547dfc6
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/yellow_candle.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/yellow_candle_lit.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/yellow_candle_lit.png
new file mode 100644
index 00000000..aeaca6b0
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/yellow_candle_lit.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/colormap/foliage.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/colormap/foliage.png
index f464dd54..b309f229 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/colormap/foliage.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/colormap/foliage.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/axolotl/axolotl_blue.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/axolotl/axolotl_blue.png
new file mode 100644
index 00000000..1437f057
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/axolotl/axolotl_blue.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/axolotl/axolotl_cyan.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/axolotl/axolotl_cyan.png
new file mode 100644
index 00000000..5a13b16f
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/axolotl/axolotl_cyan.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/axolotl/axolotl_gold.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/axolotl/axolotl_gold.png
new file mode 100644
index 00000000..186110e0
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/axolotl/axolotl_gold.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/axolotl/axolotl_lucy.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/axolotl/axolotl_lucy.png
new file mode 100644
index 00000000..0485d3f0
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/axolotl/axolotl_lucy.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/axolotl/axolotl_wild.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/axolotl/axolotl_wild.png
new file mode 100644
index 00000000..7a1cffaf
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/axolotl/axolotl_wild.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/base.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/base.png
index a590eabc..70ce7392 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/base.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/base.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/border.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/border.png
index 3e5fb432..ee613d49 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/border.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/border.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/bricks.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/bricks.png
index a0d49a7c..1821c093 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/bricks.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/bricks.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/circle.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/circle.png
index 5e1e20cd..6ee6beb3 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/circle.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/circle.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/creeper.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/creeper.png
index 2949472b..8c57b0d9 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/creeper.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/creeper.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/cross.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/cross.png
index 6a6c8c67..9868a49c 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/cross.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/cross.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/curly_border.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/curly_border.png
index d94a79a6..f39a1298 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/curly_border.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/curly_border.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/diagonal_left.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/diagonal_left.png
index f3712198..0189c317 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/diagonal_left.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/diagonal_left.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/diagonal_right.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/diagonal_right.png
index 3f2b34b3..1fa29f01 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/diagonal_right.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/diagonal_right.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/diagonal_up_left.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/diagonal_up_left.png
index c1bfa32a..27d3b662 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/diagonal_up_left.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/diagonal_up_left.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/diagonal_up_right.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/diagonal_up_right.png
index 0e99514d..8062de49 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/diagonal_up_right.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/diagonal_up_right.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/flower.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/flower.png
index 6efa798c..d990c166 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/flower.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/flower.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/globe.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/globe.png
index a7243f7e..45d0e97d 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/globe.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/globe.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/gradient.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/gradient.png
index 8bc09cf7..6e5a9414 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/gradient.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/gradient.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/gradient_up.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/gradient_up.png
index 59591815..468bd4cb 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/gradient_up.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/gradient_up.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/half_horizontal.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/half_horizontal.png
index 0ab54689..20826e14 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/half_horizontal.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/half_horizontal.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/half_horizontal_bottom.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/half_horizontal_bottom.png
index c91c8cd4..ee5f94f1 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/half_horizontal_bottom.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/half_horizontal_bottom.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/half_vertical.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/half_vertical.png
index 0f36e216..6ced0af4 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/half_vertical.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/half_vertical.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/half_vertical_right.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/half_vertical_right.png
index a8a9eb15..a05d0c11 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/half_vertical_right.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/half_vertical_right.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/mojang.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/mojang.png
index 1f993a77..30c30347 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/mojang.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/mojang.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/rhombus.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/rhombus.png
index 4657c81e..bb3dd556 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/rhombus.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/rhombus.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/skull.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/skull.png
index 77135d42..8a6cc1b3 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/skull.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/skull.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/small_stripes.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/small_stripes.png
index 0d2fe6b6..7104ad3d 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/small_stripes.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/small_stripes.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/square_bottom_left.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/square_bottom_left.png
index 0f68ec37..761d4921 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/square_bottom_left.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/square_bottom_left.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/square_bottom_right.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/square_bottom_right.png
index 799ba3c7..c6466109 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/square_bottom_right.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/square_bottom_right.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/square_top_left.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/square_top_left.png
index 02a40e41..7c1f1d9c 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/square_top_left.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/square_top_left.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/square_top_right.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/square_top_right.png
index 43f67b89..c66452cf 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/square_top_right.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/square_top_right.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/straight_cross.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/straight_cross.png
index 8d5a8c6c..b5aee999 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/straight_cross.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/straight_cross.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/stripe_bottom.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/stripe_bottom.png
index b6aafa5c..7c52d0c8 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/stripe_bottom.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/stripe_bottom.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/stripe_center.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/stripe_center.png
index 5383cae4..d7efe29f 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/stripe_center.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/stripe_center.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/stripe_downleft.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/stripe_downleft.png
index ff79d2a0..34f8e7ce 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/stripe_downleft.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/stripe_downleft.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/stripe_downright.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/stripe_downright.png
index 79bbbd06..01421935 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/stripe_downright.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/stripe_downright.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/stripe_left.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/stripe_left.png
index 45dabd3a..7b6788eb 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/stripe_left.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/stripe_left.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/stripe_middle.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/stripe_middle.png
index e98e6a8b..37feba22 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/stripe_middle.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/stripe_middle.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/stripe_right.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/stripe_right.png
index 1dc458a6..3c89f8a3 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/stripe_right.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/stripe_right.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/stripe_top.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/stripe_top.png
index 4c260396..5fc5de70 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/stripe_top.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/stripe_top.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/triangle_bottom.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/triangle_bottom.png
index 03cd2544..a324a190 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/triangle_bottom.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/triangle_bottom.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/triangle_top.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/triangle_top.png
index 852336cb..00f86623 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/triangle_top.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/triangle_top.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/triangles_bottom.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/triangles_bottom.png
index 75631252..8e535f59 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/triangles_bottom.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/triangles_bottom.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/triangles_top.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/triangles_top.png
index 25158e93..4bd0b8b2 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/triangles_top.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/banner/triangles_top.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/cat/jellie.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/cat/jellie.png
index b4afe7fb..f46287a4 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/cat/jellie.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/cat/jellie.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/cat/siamese.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/cat/siamese.png
index 8131120c..a50d4015 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/cat/siamese.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/cat/siamese.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/chest/christmas.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/chest/christmas.png
index 8a0fa73f..8cb25eef 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/chest/christmas.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/chest/christmas.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/chest/ender.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/chest/ender.png
index 642fe4cb..26cbce38 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/chest/ender.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/chest/ender.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/chest/normal.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/chest/normal.png
index ba0ec71d..ac361a55 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/chest/normal.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/chest/normal.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/chest/trapped.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/chest/trapped.png
index ca6de602..f2809266 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/chest/trapped.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/chest/trapped.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/conduit/closed_eye.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/conduit/closed_eye.png
index de10d8cf..204b1100 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/conduit/closed_eye.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/conduit/closed_eye.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/conduit/open_eye.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/conduit/open_eye.png
index 8a5d1b0a..694601d2 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/conduit/open_eye.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/conduit/open_eye.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/conduit/wind.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/conduit/wind.png
index 3287fe25..e7605d1a 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/conduit/wind.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/conduit/wind.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/conduit/wind.png.mcmeta b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/conduit/wind.png.mcmeta
index 93f0855e..969dad29 100644
--- a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/conduit/wind.png.mcmeta
+++ b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/conduit/wind.png.mcmeta
@@ -1,31 +1,6 @@
 {
   "animation": {
     "frametime": 3,
-    "width": 64,
-    "height": 32,
-    "frames": [
-      0,
-      1,
-      2,
-      3,
-      4,
-      5,
-      6,
-      7,
-      8,
-      9,
-      10,
-      11,
-      12,
-      13,
-      14,
-      15,
-      16,
-      17,
-      18,
-      19,
-      20,
-      21
-    ]
+    "height": 32
   }
 }
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/conduit/wind_vertical.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/conduit/wind_vertical.png
index a5f38ceb..f085684d 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/conduit/wind_vertical.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/conduit/wind_vertical.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/conduit/wind_vertical.png.mcmeta b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/conduit/wind_vertical.png.mcmeta
index 93f0855e..969dad29 100644
--- a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/conduit/wind_vertical.png.mcmeta
+++ b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/conduit/wind_vertical.png.mcmeta
@@ -1,31 +1,6 @@
 {
   "animation": {
     "frametime": 3,
-    "width": 64,
-    "height": 32,
-    "frames": [
-      0,
-      1,
-      2,
-      3,
-      4,
-      5,
-      6,
-      7,
-      8,
-      9,
-      10,
-      11,
-      12,
-      13,
-      14,
-      15,
-      16,
-      17,
-      18,
-      19,
-      20,
-      21
-    ]
+    "height": 32
   }
 }
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/enderdragon/dragon.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/enderdragon/dragon.png
index eea5365a..8d15e532 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/enderdragon/dragon.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/enderdragon/dragon.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/enderdragon/dragon_exploding.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/enderdragon/dragon_exploding.png
index a47a3732..9858c59e 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/enderdragon/dragon_exploding.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/enderdragon/dragon_exploding.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/enderdragon/dragon_fireball.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/enderdragon/dragon_fireball.png
index 2a3fe553..4ac6358e 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/enderdragon/dragon_fireball.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/enderdragon/dragon_fireball.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/goat/goat.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/goat/goat.png
new file mode 100644
index 00000000..c1f49260
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/goat/goat.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/guardian.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/guardian.png
index 9945242b..664f8675 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/guardian.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/guardian.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/guardian_elder.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/guardian_elder.png
index 79e0f2c1..34eae02e 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/guardian_elder.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/guardian_elder.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/horse/armor/horse_armor_leather.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/horse/armor/horse_armor_leather.png
index b991865e..0c110da9 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/horse/armor/horse_armor_leather.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/horse/armor/horse_armor_leather.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/horse/horse_skeleton.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/horse/horse_skeleton.png
index 6d1a79df..601895e6 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/horse/horse_skeleton.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/horse/horse_skeleton.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/illager/pillager.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/illager/pillager.png
index 49333896..669acc3b 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/illager/pillager.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/illager/pillager.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/iron_golem/iron_golem_crackiness_low.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/iron_golem/iron_golem_crackiness_low.png
index 0d12ff93..e5c1f155 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/iron_golem/iron_golem_crackiness_low.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/iron_golem/iron_golem_crackiness_low.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/piglin/piglin_brute.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/piglin/piglin_brute.png
new file mode 100644
index 00000000..9e84d143
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/piglin/piglin_brute.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/projectiles/spectral_arrow.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/projectiles/spectral_arrow.png
index 22a9d00b..5651e882 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/projectiles/spectral_arrow.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/projectiles/spectral_arrow.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/base.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/base.png
index 3297e7f3..263b3683 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/base.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/base.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/border.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/border.png
index 82e13d98..2960341e 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/border.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/border.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/bricks.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/bricks.png
index da9d147f..58b21f03 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/bricks.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/bricks.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/circle.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/circle.png
index 86506deb..ac4d0198 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/circle.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/circle.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/creeper.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/creeper.png
index b98b3d0a..d12cac6a 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/creeper.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/creeper.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/cross.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/cross.png
index 241aca14..5eccacf5 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/cross.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/cross.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/curly_border.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/curly_border.png
index 76c52077..180bf81e 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/curly_border.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/curly_border.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/diagonal_left.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/diagonal_left.png
index 06a18706..245ee154 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/diagonal_left.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/diagonal_left.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/diagonal_right.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/diagonal_right.png
index 2eb15cee..d4556e1b 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/diagonal_right.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/diagonal_right.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/diagonal_up_left.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/diagonal_up_left.png
index 1d475c44..3bf05fab 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/diagonal_up_left.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/diagonal_up_left.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/diagonal_up_right.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/diagonal_up_right.png
index e863fe8c..3408349f 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/diagonal_up_right.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/diagonal_up_right.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/flower.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/flower.png
index a20c753a..c6668ba8 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/flower.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/flower.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/globe.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/globe.png
index d63156f0..13c03860 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/globe.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/globe.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/gradient.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/gradient.png
index d1abad8b..97c97772 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/gradient.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/gradient.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/gradient_up.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/gradient_up.png
index ac43e901..7f78720a 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/gradient_up.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/gradient_up.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/half_horizontal.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/half_horizontal.png
index b6680525..e3a0f235 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/half_horizontal.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/half_horizontal.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/half_horizontal_bottom.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/half_horizontal_bottom.png
index 4bd2e96e..1f041d3f 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/half_horizontal_bottom.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/half_horizontal_bottom.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/half_vertical.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/half_vertical.png
index cafda314..c0a2db49 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/half_vertical.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/half_vertical.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/half_vertical_right.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/half_vertical_right.png
index 2600259f..5e4d8004 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/half_vertical_right.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/half_vertical_right.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/mojang.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/mojang.png
index 0343c52c..a5bac0c3 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/mojang.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/mojang.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/rhombus.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/rhombus.png
index 73826cea..3bcd07fa 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/rhombus.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/rhombus.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/skull.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/skull.png
index 7e35b2bb..82f1992e 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/skull.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/skull.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/small_stripes.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/small_stripes.png
index 04632175..0c9b3388 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/small_stripes.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/small_stripes.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/square_bottom_left.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/square_bottom_left.png
index b88380a8..d7e79e8d 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/square_bottom_left.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/square_bottom_left.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/square_bottom_right.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/square_bottom_right.png
index a9bcd061..83092c82 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/square_bottom_right.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/square_bottom_right.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/square_top_left.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/square_top_left.png
index a47d54b5..b5baa116 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/square_top_left.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/square_top_left.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/square_top_right.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/square_top_right.png
index 2592b938..53d89f62 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/square_top_right.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/square_top_right.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/straight_cross.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/straight_cross.png
index c613b973..22c14d9b 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/straight_cross.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/straight_cross.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/stripe_bottom.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/stripe_bottom.png
index b13d3020..b409ec31 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/stripe_bottom.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/stripe_bottom.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/stripe_center.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/stripe_center.png
index 35372717..791d9f54 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/stripe_center.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/stripe_center.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/stripe_downleft.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/stripe_downleft.png
index 178755a1..8bedb221 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/stripe_downleft.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/stripe_downleft.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/stripe_downright.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/stripe_downright.png
index cb042d15..4be982a7 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/stripe_downright.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/stripe_downright.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/stripe_left.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/stripe_left.png
index 0bf94a61..cafc50e7 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/stripe_left.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/stripe_left.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/stripe_middle.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/stripe_middle.png
index 33c8d187..d704592c 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/stripe_middle.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/stripe_middle.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/stripe_right.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/stripe_right.png
index 697da64e..1df94668 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/stripe_right.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/stripe_right.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/stripe_top.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/stripe_top.png
index eca1076a..3b80f86d 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/stripe_top.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/stripe_top.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/triangle_bottom.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/triangle_bottom.png
index 03c37d32..16c41754 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/triangle_bottom.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/triangle_bottom.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/triangle_top.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/triangle_top.png
index 26412bf8..2fbbf788 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/triangle_top.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/triangle_top.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/triangles_bottom.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/triangles_bottom.png
index 8a18dbd7..4e1d0998 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/triangles_bottom.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/triangles_bottom.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/triangles_top.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/triangles_top.png
index 2e07c37c..0fdcd09b 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/triangles_top.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/shield/triangles_top.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/signs/acacia.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/signs/acacia.png
index 9f129ddd..cc4da939 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/signs/acacia.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/signs/acacia.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/signs/birch.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/signs/birch.png
index 4379d7b0..8f5fe006 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/signs/birch.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/signs/birch.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/signs/dark_oak.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/signs/dark_oak.png
index 3835f7a2..6c2f0447 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/signs/dark_oak.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/signs/dark_oak.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/signs/jungle.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/signs/jungle.png
index 779193d5..6b88296b 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/signs/jungle.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/signs/jungle.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/signs/oak.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/signs/oak.png
index e0f23685..95a47418 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/signs/oak.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/signs/oak.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/signs/spruce.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/signs/spruce.png
index 73a0fdce..ee34c810 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/signs/spruce.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/signs/spruce.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/squid/glow_squid.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/squid/glow_squid.png
new file mode 100644
index 00000000..bfc8e0e1
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/squid/glow_squid.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/squid/squid.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/squid/squid.png
new file mode 100644
index 00000000..db97d6da
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/squid/squid.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/villager/profession/cleric.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/villager/profession/cleric.png
index cbe16300..9542f4da 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/villager/profession/cleric.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/villager/profession/cleric.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/villager/profession/fletcher.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/villager/profession/fletcher.png
index 9b817cf1..c0f00580 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/villager/profession/fletcher.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/villager/profession/fletcher.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/villager/profession/librarian.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/villager/profession/librarian.png
index 58db1a89..d9728b82 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/villager/profession/librarian.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/villager/profession/librarian.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/zombie_villager/profession/cleric.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/zombie_villager/profession/cleric.png
index cbe16300..9542f4da 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/zombie_villager/profession/cleric.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/zombie_villager/profession/cleric.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/zombie_villager/profession/fletcher.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/zombie_villager/profession/fletcher.png
index 9b817cf1..c0f00580 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/zombie_villager/profession/fletcher.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/zombie_villager/profession/fletcher.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/zombie_villager/profession/librarian.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/zombie_villager/profession/librarian.png
index 58db1a89..d9728b82 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/zombie_villager/profession/librarian.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/entity/zombie_villager/profession/librarian.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/font/accented.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/font/accented.png
index d23f660d..e7e04845 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/font/accented.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/font/accented.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/font/nonlatin_european.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/font/nonlatin_european.png
index ab964c1e..4342739d 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/font/nonlatin_european.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/font/nonlatin_european.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/font/unicode_page_17.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/font/unicode_page_17.png
index 53d48d29..7c06ef1d 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/font/unicode_page_17.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/font/unicode_page_17.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/font/unicode_page_2c.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/font/unicode_page_2c.png
index c4d9cb2f..daea036f 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/font/unicode_page_2c.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/font/unicode_page_2c.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/font/unicode_page_33.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/font/unicode_page_33.png
index 6eaac244..b2ecd116 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/font/unicode_page_33.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/font/unicode_page_33.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/font/unicode_page_54.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/font/unicode_page_54.png
index 3fd0cd72..3f616e32 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/font/unicode_page_54.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/font/unicode_page_54.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/gui/container/blast_furnace.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/gui/container/blast_furnace.png
index 452ad342..f40de39d 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/gui/container/blast_furnace.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/gui/container/blast_furnace.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/gui/container/brewing_stand.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/gui/container/brewing_stand.png
index 56b72ce9..e69375d7 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/gui/container/brewing_stand.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/gui/container/brewing_stand.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/gui/container/bundle.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/gui/container/bundle.png
new file mode 100644
index 00000000..a5b55ee4
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/gui/container/bundle.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/gui/container/gamemode_switcher.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/gui/container/gamemode_switcher.png
index 68e85540..08b0bab5 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/gui/container/gamemode_switcher.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/gui/container/gamemode_switcher.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/gui/container/generic_54.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/gui/container/generic_54.png
index 9169433f..3efcb900 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/gui/container/generic_54.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/gui/container/generic_54.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/gui/container/inventory.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/gui/container/inventory.png
index 79430fb3..cb7dcd0d 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/gui/container/inventory.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/gui/container/inventory.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/gui/container/shulker_box.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/gui/container/shulker_box.png
index 40cbb46d..5210658a 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/gui/container/shulker_box.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/gui/container/shulker_box.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/gui/container/smoker.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/gui/container/smoker.png
index 452ad342..f40de39d 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/gui/container/smoker.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/gui/container/smoker.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/gui/container/stats_icons.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/gui/container/stats_icons.png
index ff4029e9..8610e08b 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/gui/container/stats_icons.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/gui/container/stats_icons.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/gui/icons.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/gui/icons.png
index 25421224..417b7300 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/gui/icons.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/gui/icons.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/gui/recipe_button.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/gui/recipe_button.png
index 3be6b1ca..95ebb0bc 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/gui/recipe_button.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/gui/recipe_button.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/gui/social_interactions.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/gui/social_interactions.png
new file mode 100644
index 00000000..54a3fc3f
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/gui/social_interactions.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/gui/toasts.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/gui/toasts.png
index 30015e9c..8694b9a1 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/gui/toasts.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/gui/toasts.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/amethyst_shard.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/amethyst_shard.png
new file mode 100644
index 00000000..4dce7915
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/amethyst_shard.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/axolotl_bucket.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/axolotl_bucket.png
new file mode 100644
index 00000000..6ed17e86
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/axolotl_bucket.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/black_candle.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/black_candle.png
new file mode 100644
index 00000000..2b7ae4ce
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/black_candle.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/blue_candle.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/blue_candle.png
new file mode 100644
index 00000000..3e38fa33
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/blue_candle.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/brown_candle.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/brown_candle.png
new file mode 100644
index 00000000..f34a0a5e
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/brown_candle.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/bundle.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/bundle.png
new file mode 100644
index 00000000..991f8955
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/bundle.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/bundle_filled.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/bundle_filled.png
new file mode 100644
index 00000000..5b29f04f
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/bundle_filled.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/candle.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/candle.png
new file mode 100644
index 00000000..246c9e12
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/candle.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/chain.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/chain.png
index b64bfa4f..35a8c215 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/chain.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/chain.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_00.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_00.png
index ef06df78..ba789541 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_00.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_00.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_01.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_01.png
index 558826e9..339510e6 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_01.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_01.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_02.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_02.png
index 566342d8..405cfddd 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_02.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_02.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_03.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_03.png
index 823f4133..95871546 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_03.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_03.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_04.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_04.png
index 6bdf2c56..2f5abd49 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_04.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_04.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_05.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_05.png
index ce75473a..832b6e1d 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_05.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_05.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_06.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_06.png
index 35118583..796101b6 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_06.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_06.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_07.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_07.png
index faffee0f..0259a63b 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_07.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_07.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_08.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_08.png
index a712e570..82b9fcee 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_08.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_08.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_09.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_09.png
index f89d9d82..e1b3abfe 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_09.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_09.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_10.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_10.png
index 93765b84..755fd397 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_10.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_10.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_11.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_11.png
index 649e0c26..9ce09cd9 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_11.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_11.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_12.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_12.png
index 581c5fb5..67b300b9 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_12.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_12.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_13.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_13.png
index f99f4edd..8d9cd1db 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_13.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_13.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_14.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_14.png
index c06960f8..949f0021 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_14.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_14.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_15.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_15.png
index 655cc269..fd3d9df5 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_15.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_15.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_16.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_16.png
index 1e6d2675..a9446970 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_16.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_16.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_17.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_17.png
index a159a038..422cd129 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_17.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_17.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_18.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_18.png
index 3de00852..05111995 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_18.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_18.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_19.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_19.png
index c311f89f..a7d6aede 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_19.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_19.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_20.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_20.png
index 9e23788d..e400e746 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_20.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_20.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_21.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_21.png
index ef1426d5..94993e31 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_21.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_21.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_22.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_22.png
index 2a4d1063..680bce59 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_22.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_22.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_23.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_23.png
index 6ac7b236..4f8e18bb 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_23.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_23.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_24.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_24.png
index 38909b9a..e85289d2 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_24.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_24.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_25.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_25.png
index 9a007549..e042a3cd 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_25.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_25.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_26.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_26.png
index b5abba3f..18b3a175 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_26.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_26.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_27.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_27.png
index a172a0c4..5541becc 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_27.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_27.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_28.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_28.png
index 0a7b26bb..9d7578d6 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_28.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_28.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_29.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_29.png
index e9f1e56c..d9c22ffd 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_29.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_29.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_30.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_30.png
index 7cb68598..dbccf976 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_30.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_30.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_31.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_31.png
index 4bfff485..47377b04 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_31.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_31.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_32.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_32.png
index 54537edd..58449075 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_32.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_32.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_33.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_33.png
index 4645b924..173f31fd 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_33.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_33.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_34.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_34.png
index 3d04df72..c9ed0376 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_34.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_34.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_35.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_35.png
index b0b13749..eabfba7c 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_35.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_35.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_36.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_36.png
index cb6bfbfb..b8672f80 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_36.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_36.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_37.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_37.png
index 816b257f..61179de2 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_37.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_37.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_38.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_38.png
index c3aa0160..de79bfa0 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_38.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_38.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_39.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_39.png
index f81d5a61..2cdf5d8e 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_39.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_39.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_40.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_40.png
index 77964678..b78bf3d7 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_40.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_40.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_41.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_41.png
index 1f804564..e070cf2b 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_41.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_41.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_42.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_42.png
index 3b120d97..fc3a11f5 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_42.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_42.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_43.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_43.png
index e1b48343..74a4d910 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_43.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_43.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_44.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_44.png
index 851489a3..891471f8 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_44.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_44.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_45.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_45.png
index 086ec28f..33e3d9e9 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_45.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_45.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_46.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_46.png
index 3b0bca4b..34250284 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_46.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_46.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_47.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_47.png
index ec92161d..62a6cd16 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_47.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_47.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_48.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_48.png
index 1a00a5ac..59ee5989 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_48.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_48.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_49.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_49.png
index 13e08b95..bd5914c8 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_49.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_49.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_50.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_50.png
index 39edd8c0..0e021f1b 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_50.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_50.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_51.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_51.png
index fa4614ed..c6db39b4 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_51.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_51.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_52.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_52.png
index 6578dc17..bbc9a18a 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_52.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_52.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_53.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_53.png
index 882cdd09..f06f315e 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_53.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_53.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_54.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_54.png
index d6af37bd..c9829c98 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_54.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_54.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_55.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_55.png
index 909d24fd..8bd6ff64 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_55.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_55.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_56.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_56.png
index f8ac1095..76fea41e 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_56.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_56.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_57.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_57.png
index edfc89ff..a1574552 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_57.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_57.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_58.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_58.png
index 76f6f933..514025c4 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_58.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_58.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_59.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_59.png
index 9b01436d..a55a17a3 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_59.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_59.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_60.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_60.png
index 3074f9c7..e6ee83ad 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_60.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_60.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_61.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_61.png
index ca7b584f..4452f3be 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_61.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_61.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_62.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_62.png
index 1f014d60..1a61d432 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_62.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_62.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_63.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_63.png
index 4c55f08c..0d7889ad 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_63.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/clock_63.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_00.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_00.png
index 04e6f067..809b04ed 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_00.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_00.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_01.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_01.png
index 2c00488c..61257e55 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_01.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_01.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_02.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_02.png
index 7ed3073e..a4c11a90 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_02.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_02.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_03.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_03.png
index 6f4e1663..81986087 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_03.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_03.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_04.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_04.png
index e721770d..06742cd9 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_04.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_04.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_05.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_05.png
index 0620ea5d..b330db6b 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_05.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_05.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_06.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_06.png
index 21a8747f..2bcc0f70 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_06.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_06.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_07.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_07.png
index c2a347b1..565fa697 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_07.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_07.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_08.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_08.png
index c2a347b1..4224c588 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_08.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_08.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_09.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_09.png
index c2a347b1..565fa697 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_09.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_09.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_10.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_10.png
index 7405ae86..c5fa5c4c 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_10.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_10.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_11.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_11.png
index 18d3e9f1..b9f30149 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_11.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_11.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_12.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_12.png
index 5405a62f..2d819ca2 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_12.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_12.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_13.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_13.png
index 1c3354b4..69812370 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_13.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_13.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_14.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_14.png
index 76d48f3e..53e314cd 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_14.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_14.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_15.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_15.png
index bc0cd8b8..49515c84 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_15.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_15.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_16.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_16.png
index a9e603b2..4337dedf 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_16.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_16.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_17.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_17.png
index 36802213..7108641b 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_17.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_17.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_18.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_18.png
index edbc2eda..a5a6b51f 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_18.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_18.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_19.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_19.png
index 23c0c34b..2f7e8f10 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_19.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_19.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_20.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_20.png
index 5aaf8c50..07177951 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_20.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_20.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_21.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_21.png
index 8a99abd9..282db752 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_21.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_21.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_22.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_22.png
index 9dd84237..1149f24f 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_22.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_22.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_23.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_23.png
index 61d739e6..e0bfe28d 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_23.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_23.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_24.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_24.png
index 61d739e6..e0bfe28d 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_24.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_24.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_25.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_25.png
index 61d739e6..e0bfe28d 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_25.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_25.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_26.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_26.png
index eb5e8027..b4b2b2b7 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_26.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_26.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_27.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_27.png
index 348dac2e..7d525c15 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_27.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_27.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_28.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_28.png
index 8d681982..7d525c15 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_28.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_28.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_29.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_29.png
index b1683b26..81867ae0 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_29.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_29.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_30.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_30.png
index ba9be61d..0d827d7d 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_30.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_30.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_31.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_31.png
index 2ae89a20..def0d8da 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_31.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/compass_31.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/copper_ingot.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/copper_ingot.png
new file mode 100644
index 00000000..bd252f06
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/copper_ingot.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/cyan_candle.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/cyan_candle.png
new file mode 100644
index 00000000..6958b654
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/cyan_candle.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/glow_berries.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/glow_berries.png
new file mode 100644
index 00000000..79918990
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/glow_berries.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/glow_ink_sac.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/glow_ink_sac.png
new file mode 100644
index 00000000..210ef565
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/glow_ink_sac.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/glow_item_frame.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/glow_item_frame.png
new file mode 100644
index 00000000..65a1b239
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/glow_item_frame.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/gray_candle.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/gray_candle.png
new file mode 100644
index 00000000..48513ed1
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/gray_candle.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/green_candle.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/green_candle.png
new file mode 100644
index 00000000..b562e1b9
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/green_candle.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/jungle_door.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/jungle_door.png
index 422401fb..a817af0e 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/jungle_door.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/jungle_door.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light.png
new file mode 100644
index 00000000..9204f516
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_00.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_00.png
new file mode 100644
index 00000000..7dac321c
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_00.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_01.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_01.png
new file mode 100644
index 00000000..3561c3c2
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_01.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_02.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_02.png
new file mode 100644
index 00000000..3f717f00
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_02.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_03.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_03.png
new file mode 100644
index 00000000..adb4b5c6
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_03.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_04.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_04.png
new file mode 100644
index 00000000..1ce4596e
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_04.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_05.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_05.png
new file mode 100644
index 00000000..ff669e9d
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_05.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_06.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_06.png
new file mode 100644
index 00000000..dcb9ad1a
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_06.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_07.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_07.png
new file mode 100644
index 00000000..56286369
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_07.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_08.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_08.png
new file mode 100644
index 00000000..487235cb
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_08.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_09.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_09.png
new file mode 100644
index 00000000..61c6a2b4
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_09.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_10.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_10.png
new file mode 100644
index 00000000..11b8cd42
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_10.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_11.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_11.png
new file mode 100644
index 00000000..f469c57e
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_11.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_12.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_12.png
new file mode 100644
index 00000000..ddd68861
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_12.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_13.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_13.png
new file mode 100644
index 00000000..f8381bb2
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_13.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_14.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_14.png
new file mode 100644
index 00000000..c298d7f1
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_14.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_15.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_15.png
new file mode 100644
index 00000000..a42526c1
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_15.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_blue_candle.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_blue_candle.png
new file mode 100644
index 00000000..9fc62b1d
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_blue_candle.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_gray_candle.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_gray_candle.png
new file mode 100644
index 00000000..578eb464
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/light_gray_candle.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/lime_candle.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/lime_candle.png
new file mode 100644
index 00000000..7834ace5
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/lime_candle.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/magenta_candle.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/magenta_candle.png
new file mode 100644
index 00000000..c58d586f
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/magenta_candle.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/orange_candle.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/orange_candle.png
new file mode 100644
index 00000000..e4529e76
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/orange_candle.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/pink_candle.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/pink_candle.png
new file mode 100644
index 00000000..7a87362e
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/pink_candle.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/pointed_dripstone.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/pointed_dripstone.png
new file mode 100644
index 00000000..dcd1090a
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/pointed_dripstone.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/powder_snow_bucket.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/powder_snow_bucket.png
new file mode 100644
index 00000000..3c5522d6
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/powder_snow_bucket.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/purple_candle.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/purple_candle.png
new file mode 100644
index 00000000..4e2396e0
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/purple_candle.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/raw_copper.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/raw_copper.png
new file mode 100644
index 00000000..c03d9597
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/raw_copper.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/raw_gold.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/raw_gold.png
new file mode 100644
index 00000000..4d41e69d
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/raw_gold.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/raw_iron.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/raw_iron.png
new file mode 100644
index 00000000..6508fb0e
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/raw_iron.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/red_candle.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/red_candle.png
new file mode 100644
index 00000000..b7690c34
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/red_candle.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/soul_lantern.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/soul_lantern.png
index c9addf4e..9d330af1 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/soul_lantern.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/soul_lantern.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/spyglass.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/spyglass.png
new file mode 100644
index 00000000..e495d825
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/spyglass.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/spyglass_model.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/spyglass_model.png
new file mode 100644
index 00000000..4591137f
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/spyglass_model.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/sugar_cane.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/sugar_cane.png
index 610f464b..bb12a70e 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/sugar_cane.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/sugar_cane.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/white_candle.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/white_candle.png
new file mode 100644
index 00000000..6c768acb
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/white_candle.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/yellow_candle.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/yellow_candle.png
new file mode 100644
index 00000000..817a44c1
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/item/yellow_candle.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/misc/nausea.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/misc/nausea.png
new file mode 100644
index 00000000..7d855f70
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/misc/nausea.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/misc/powder_snow_outline.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/misc/powder_snow_outline.png
new file mode 100644
index 00000000..2b3c026f
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/misc/powder_snow_outline.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/misc/spyglass_scope.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/misc/spyglass_scope.png
new file mode 100644
index 00000000..87a81c93
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/misc/spyglass_scope.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/misc/vignette.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/misc/vignette.png
index 5c8e97f7..e17afdf1 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/misc/vignette.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/misc/vignette.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/misc/white.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/misc/white.png
new file mode 100644
index 00000000..cb4b05d9
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/misc/white.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/models/armor/netherite_layer_2.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/models/armor/netherite_layer_2.png
index b8d47ebd..963f0826 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/models/armor/netherite_layer_2.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/models/armor/netherite_layer_2.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/painting/back.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/painting/back.png
index 0e9bdece..083ac5f7 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/painting/back.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/painting/back.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/painting/courbet.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/painting/courbet.png
index 4c533d54..e90273a0 100644
Binary files a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/painting/courbet.png and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/painting/courbet.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/particle/glow.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/particle/glow.png
new file mode 100644
index 00000000..23e46230
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/particle/glow.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/particle/vibration.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/particle/vibration.png
new file mode 100644
index 00000000..d108f598
Binary files /dev/null and b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/particle/vibration.png differ
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/particle/vibration.png.mcmeta b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/particle/vibration.png.mcmeta
new file mode 100644
index 00000000..d1cd0799
--- /dev/null
+++ b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/particle/vibration.png.mcmeta
@@ -0,0 +1,5 @@
+{
+    "animation": {
+        "frametime": 1
+    }
+}
diff --git a/build.gradle b/build.gradle
index f286b5da..ff146bd9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,7 @@ allprojects  {
   apply plugin: 'java'
   
   group = 'us.dynmap'
-  version = '3.2-SNAPSHOT'
+  version = '3.2-beta-1'
 
 }
 
diff --git a/bukkit-helper-117/.gitignore b/bukkit-helper-117/.gitignore
new file mode 100644
index 00000000..84c048a7
--- /dev/null
+++ b/bukkit-helper-117/.gitignore
@@ -0,0 +1 @@
+/build/
diff --git a/bukkit-helper-117/build.gradle b/bukkit-helper-117/build.gradle
new file mode 100644
index 00000000..e4bb7ec3
--- /dev/null
+++ b/bukkit-helper-117/build.gradle
@@ -0,0 +1,10 @@
+
+description = 'bukkit-helper-1.17'
+
+dependencies {
+  compile project(':bukkit-helper')
+  compile project(':dynmap-api')
+  compile project(path: ':DynmapCore', configuration: 'shadow')
+  compile group: 'org.spigotmc', name: 'spigot-api', version:'1.17-R0.1-SNAPSHOT'
+  compile group: 'org.spigotmc', name: 'spigot', version:'1.17-R0.1-SNAPSHOT'
+}
diff --git a/bukkit-helper-117/src/main/java/org/dynmap/bukkit/helper/v117/BukkitVersionHelperSpigot117.java b/bukkit-helper-117/src/main/java/org/dynmap/bukkit/helper/v117/BukkitVersionHelperSpigot117.java
new file mode 100644
index 00000000..1580c7ba
--- /dev/null
+++ b/bukkit-helper-117/src/main/java/org/dynmap/bukkit/helper/v117/BukkitVersionHelperSpigot117.java
@@ -0,0 +1,403 @@
+package org.dynmap.bukkit.helper.v117;
+
+import org.bukkit.*;
+import org.bukkit.craftbukkit.v1_17_R1.CraftChunk;
+import org.bukkit.craftbukkit.v1_17_R1.entity.CraftPlayer;
+import org.bukkit.entity.Player;
+import org.dynmap.DynmapChunk;
+import org.dynmap.Log;
+import org.dynmap.bukkit.helper.BukkitMaterial;
+import org.dynmap.bukkit.helper.BukkitVersionHelper;
+import org.dynmap.bukkit.helper.BukkitWorld;
+import org.dynmap.bukkit.helper.BukkitVersionHelperGeneric.TexturesPayload;
+import org.dynmap.bukkit.helper.v117.MapChunkCache117;
+import org.dynmap.renderer.DynmapBlockState;
+import org.dynmap.utils.MapChunkCache;
+import org.dynmap.utils.Polygon;
+import org.yaml.snakeyaml.external.biz.base64Coder.Base64Coder;
+
+import com.google.common.base.Charsets;
+import com.google.common.collect.Iterables;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonParseException;
+import com.mojang.authlib.GameProfile;
+import com.mojang.authlib.properties.Property;
+import com.mojang.authlib.properties.PropertyMap;
+
+import net.minecraft.core.IRegistry;
+import net.minecraft.nbt.NBTBase;
+import net.minecraft.nbt.NBTTagByte;
+import net.minecraft.nbt.NBTTagByteArray;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagDouble;
+import net.minecraft.nbt.NBTTagFloat;
+import net.minecraft.nbt.NBTTagInt;
+import net.minecraft.nbt.NBTTagIntArray;
+import net.minecraft.nbt.NBTTagLong;
+import net.minecraft.nbt.NBTTagShort;
+import net.minecraft.nbt.NBTTagString;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.world.level.biome.BiomeBase;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.BlockFluids;
+import net.minecraft.world.level.block.BlockRotatable;
+import net.minecraft.world.level.block.entity.TileEntity;
+import net.minecraft.world.level.block.state.IBlockData;
+import net.minecraft.world.level.material.Material;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.IdentityHashMap;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * Helper for isolation of bukkit version specific issues
+ */
+public class BukkitVersionHelperSpigot117 extends BukkitVersionHelper {    
+    public BukkitVersionHelperSpigot117() {
+    }
+    
+    /**
+     * Get block short name list
+     */
+    @Override
+    public String[] getBlockNames() {
+    	int cnt = Block.p.a();
+    	String[] names = new String[cnt];
+    	for (int i = 0; i < cnt; i++) {
+    		IBlockData bd = Block.getByCombinedId(i);
+    		names[i] = IRegistry.W.getKey(bd.getBlock()).toString();
+    		Log.info(i + ": blk=" + names[i] + ", bd=" + bd.toString());
+    	}
+        return names;
+    }
+
+    private IRegistry<BiomeBase> reg = null;
+
+    private IRegistry<BiomeBase> getBiomeReg() {
+    	if (reg == null) {
+    		reg = MinecraftServer.getServer().getCustomRegistry().b(IRegistry.aO);
+    	}
+    	return reg;
+    }
+    
+    private Object[] biomelist;
+    /**
+     * Get list of defined biomebase objects
+     */
+    @Override
+    public Object[] getBiomeBaseList() {
+    	if (biomelist == null) {
+    		biomelist = new Object[1024];
+            for (int i = 0; i < 1024; i++) {
+            	biomelist[i] = getBiomeReg().fromId(i);
+            }
+        }
+        return biomelist;
+    }
+
+    /** Get ID from biomebase */
+    @Override
+    public int getBiomeBaseID(Object bb) {
+    	return getBiomeReg().getId((BiomeBase)bb);
+    }
+    
+    public static IdentityHashMap<IBlockData, DynmapBlockState> dataToState;
+    
+    /**
+     * Initialize block states (org.dynmap.blockstate.DynmapBlockState)
+     */
+    @Override
+    public void initializeBlockStates() {
+    	dataToState = new IdentityHashMap<IBlockData, DynmapBlockState>();
+    	HashMap<String, DynmapBlockState> lastBlockState = new HashMap<String, DynmapBlockState>();
+    	
+    	int cnt = Block.p.a();
+    	// Loop through block data states
+    	for (int i = 0; i < cnt; i++) {
+    		IBlockData bd = Block.getByCombinedId(i);
+    		String bname = IRegistry.W.getKey(bd.getBlock()).toString();
+    		DynmapBlockState lastbs = lastBlockState.get(bname);	// See if we have seen this one
+    		int idx = 0;
+    		if (lastbs != null) {	// Yes
+    			idx = lastbs.getStateCount();	// Get number of states so far, since this is next
+    		}
+    		// Build state name
+    		String sb = "";
+    		String fname = bd.toString();
+    		int off1 = fname.indexOf('[');
+    		if (off1 >= 0) {
+    			int off2 = fname.indexOf(']');
+    			sb = fname.substring(off1+1, off2);
+    		}
+    		Material mat = bd.getMaterial();
+            DynmapBlockState bs = new DynmapBlockState(lastbs, idx, bname, sb, mat.toString());
+            if ((!bd.getFluid().isEmpty()) && ((bd.getBlock() instanceof BlockFluids) == false)) {	// Test if fluid type for block is not empty
+            	bs.setWaterlogged();
+            }
+            if (mat == Material.a) {	// AIR
+            	bs.setAir();
+            }
+    		if (mat == Material.E) {	// LEAVES
+    			bs.setLeaves();
+    		}
+    		if ((bd.getBlock() instanceof BlockRotatable) && (bd.getMaterial() == Material.z)) {	// WOOD
+    			bs.setLog();
+    		}
+    		if (mat.isSolid()) {
+    			bs.setSolid();
+    		}
+    		dataToState.put(bd,  bs);
+    		lastBlockState.put(bname, (lastbs == null) ? bs : lastbs);
+    		Log.verboseinfo(i + ": blk=" + bname + ", idx=" + idx + ", state=" + sb + ", waterlogged=" + bs.isWaterlogged());
+    	}
+    }
+    /**
+     * Create chunk cache for given chunks of given world
+     * @param dw - world
+     * @param chunks - chunk list
+     * @return cache
+     */
+    @Override
+    public MapChunkCache getChunkCache(BukkitWorld dw, List<DynmapChunk> chunks) {
+        MapChunkCache117 c = new MapChunkCache117();
+        c.setChunks(dw, chunks);
+        return c;
+    }
+    
+	/**
+	 * Get biome base water multiplier
+	 */
+    @Override
+	public int getBiomeBaseWaterMult(Object bb) {
+    	BiomeBase biome = (BiomeBase)bb;
+    	return biome.l().b();	// waterColor
+	}
+
+    /** Get temperature from biomebase */
+    @Override
+    public float getBiomeBaseTemperature(Object bb) {
+    	return ((BiomeBase)bb).k();
+    }
+
+    /** Get humidity from biomebase */
+    @Override
+    public float getBiomeBaseHumidity(Object bb) {
+    	return ((BiomeBase)bb).getHumidity();    	
+    }
+    
+    @Override
+    public Polygon getWorldBorder(World world) {
+        Polygon p = null;
+        WorldBorder wb = world.getWorldBorder();
+        if (wb != null) {
+        	Location c = wb.getCenter();
+        	double size = wb.getSize();
+        	if ((size > 1) && (size < 1E7)) {
+        	    size = size / 2;
+        		p = new Polygon();
+        		p.addVertex(c.getX()-size, c.getZ()-size);
+        		p.addVertex(c.getX()+size, c.getZ()-size);
+        		p.addVertex(c.getX()+size, c.getZ()+size);
+        		p.addVertex(c.getX()-size, c.getZ()+size);
+        	}
+        }
+        return p;
+    }
+	// Send title/subtitle to user
+    public void sendTitleText(Player p, String title, String subtitle, int fadeInTicks, int stayTicks, int fadeOutTIcks) {
+    	if (p != null) {
+    		p.sendTitle(title, subtitle, fadeInTicks, stayTicks, fadeOutTIcks);
+    	}
+    }
+    
+    /**
+     * Get material map by block ID
+     */
+    @Override
+    public BukkitMaterial[] getMaterialList() {
+    	return new BukkitMaterial[4096];	// Not used
+    }
+
+	@Override
+	public void unloadChunkNoSave(World w, org.bukkit.Chunk c, int cx, int cz) {
+		Log.severe("unloadChunkNoSave not implemented");
+	}
+
+	private String[] biomenames;
+	@Override
+	public String[] getBiomeNames() {
+    	if (biomenames == null) {
+    		biomenames = new String[1024];
+            for (int i = 0; i < 1024; i++) {
+            	BiomeBase bb = getBiomeReg().fromId(i);
+            	if (bb != null) {
+            		biomenames[i] = bb.toString();
+            	}
+            }
+        }
+        return biomenames;
+	}
+
+	@Override
+	public String getStateStringByCombinedId(int blkid, int meta) {
+        Log.severe("getStateStringByCombinedId not implemented");		
+		return null;
+	}
+	@Override
+    /** Get ID string from biomebase */
+    public String getBiomeBaseIDString(Object bb) {
+        String s = ((BiomeBase)bb).toString();
+        if (s != null) {
+        	String[] ss = s.split("\\.");
+        	return ss[ss.length-1];
+        }
+        return null;
+    }
+
+	@Override
+	public Object getUnloadQueue(World world) {
+		System.out.println("getUnloadQueue not implemented yet");
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public boolean isInUnloadQueue(Object unloadqueue, int x, int z) {
+		System.out.println("isInUnloadQueue not implemented yet");
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public Object[] getBiomeBaseFromSnapshot(ChunkSnapshot css) {
+		System.out.println("getBiomeBaseFromSnapshot not implemented yet");
+		// TODO Auto-generated method stub
+		return new Object[256];
+	}
+
+	@Override
+	public long getInhabitedTicks(Chunk c) {
+		return ((CraftChunk)c).getHandle().getInhabitedTime();
+	}
+
+	@Override
+	public Map<?, ?> getTileEntitiesForChunk(Chunk c) {
+		return ((CraftChunk)c).getHandle().l;
+	}
+
+	@Override
+	public int getTileEntityX(Object te) {
+		TileEntity tileent = (TileEntity) te;
+		return tileent.getPosition().getX();
+	}
+
+	@Override
+	public int getTileEntityY(Object te) {
+		TileEntity tileent = (TileEntity) te;
+		return tileent.getPosition().getY();
+	}
+
+	@Override
+	public int getTileEntityZ(Object te) {
+		TileEntity tileent = (TileEntity) te;
+		return tileent.getPosition().getZ();
+	}
+
+	@Override
+	public Object readTileEntityNBT(Object te) {
+		TileEntity tileent = (TileEntity) te;
+		NBTTagCompound nbt = new NBTTagCompound();
+		tileent.save(nbt);	// readNBT
+        return nbt;
+	}
+
+	@Override
+	public Object getFieldValue(Object nbt, String field) {
+		NBTTagCompound rec = (NBTTagCompound) nbt;
+		NBTBase val = rec.get(field);
+        if(val == null) return null;
+        if(val instanceof NBTTagByte) {
+            return ((NBTTagByte)val).asByte();
+        }
+        else if(val instanceof NBTTagShort) {
+            return ((NBTTagShort)val).asShort();
+        }
+        else if(val instanceof NBTTagInt) {
+            return ((NBTTagInt)val).asInt();
+        }
+        else if(val instanceof NBTTagLong) {
+            return ((NBTTagLong)val).asLong();
+        }
+        else if(val instanceof NBTTagFloat) {
+            return ((NBTTagFloat)val).asFloat();
+        }
+        else if(val instanceof NBTTagDouble) {
+            return ((NBTTagDouble)val).asDouble();
+        }
+        else if(val instanceof NBTTagByteArray) {
+            return ((NBTTagByteArray)val).getBytes();
+        }
+        else if(val instanceof NBTTagString) {
+            return ((NBTTagString)val).asString();
+        }
+        else if(val instanceof NBTTagIntArray) {
+            return ((NBTTagIntArray)val).getInts();
+        }
+        return null;
+	}
+
+	@Override
+	public Player[] getOnlinePlayers() {
+        Collection<? extends Player> p = Bukkit.getServer().getOnlinePlayers();
+        return p.toArray(new Player[0]);
+	}
+
+	@Override
+	public double getHealth(Player p) {
+		return p.getHealth();
+	}
+	
+    private static final Gson gson = new GsonBuilder().create();
+
+    /**
+     * Get skin URL for player
+     * @param player
+     */
+	@Override
+    public String getSkinURL(Player player) {
+    	String url = null;
+    	CraftPlayer cp = (CraftPlayer)player;
+    	GameProfile profile = cp.getProfile();
+    	if (profile != null) {
+    		PropertyMap pm = profile.getProperties();
+    		if (pm != null) {
+    			Collection<Property> txt = pm.get("textures");
+    	        Property textureProperty = Iterables.getFirst(pm.get("textures"), null);
+    	        if (textureProperty != null) {
+    				String val = textureProperty.getValue();
+    				if (val != null) {
+    					TexturesPayload result = null;
+    					try {
+    						String json = new String(Base64Coder.decode(val), Charsets.UTF_8);
+    						result = gson.fromJson(json, TexturesPayload.class);
+    					} catch (JsonParseException e) {
+    					} catch (IllegalArgumentException x) {
+    						Log.warning("Malformed response from skin URL check: " + val);
+    					}
+    					if ((result != null) && (result.textures != null) && (result.textures.containsKey("SKIN"))) {
+    						url = result.textures.get("SKIN").url;
+    					}
+    				}
+    			}
+    		}
+    	}    	
+    	return url;
+    }
+
+}
diff --git a/bukkit-helper-117/src/main/java/org/dynmap/bukkit/helper/v117/MapChunkCache117.java b/bukkit-helper-117/src/main/java/org/dynmap/bukkit/helper/v117/MapChunkCache117.java
new file mode 100644
index 00000000..9acddecd
--- /dev/null
+++ b/bukkit-helper-117/src/main/java/org/dynmap/bukkit/helper/v117/MapChunkCache117.java
@@ -0,0 +1,492 @@
+package org.dynmap.bukkit.helper.v117;
+
+import org.bukkit.ChunkSnapshot;
+import org.bukkit.World;
+import org.bukkit.block.Biome;
+import org.bukkit.craftbukkit.v1_17_R1.CraftWorld;
+import org.dynmap.DynmapChunk;
+import org.dynmap.DynmapCore;
+import org.dynmap.bukkit.helper.AbstractMapChunkCache;
+import org.dynmap.bukkit.helper.BukkitVersionHelper;
+import org.dynmap.bukkit.helper.SnapshotCache;
+import org.dynmap.bukkit.helper.SnapshotCache.SnapshotRec;
+import org.dynmap.renderer.DynmapBlockState;
+import org.dynmap.utils.DynIntHashMap;
+import org.dynmap.utils.VisibilityLimit;
+
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.util.DataBits;
+import net.minecraft.util.datafix.DataBitsPacked;
+import net.minecraft.world.level.ChunkCoordIntPair;
+import net.minecraft.world.level.chunk.Chunk;
+import net.minecraft.world.level.chunk.ChunkStatus;
+import net.minecraft.world.level.chunk.storage.ChunkRegionLoader;
+
+import java.io.IOException;
+import java.util.Arrays;
+
+/**
+ * Container for managing chunks - dependent upon using chunk snapshots, since rendering is off server thread
+ */
+public class MapChunkCache117 extends AbstractMapChunkCache {
+
+	public static class NBTSnapshot implements Snapshot {
+	    private static interface Section {
+	        public DynmapBlockState getBlockType(int x, int y, int z);
+	        public int getBlockSkyLight(int x, int y, int z);
+	        public int getBlockEmittedLight(int x, int y, int z);
+	        public boolean isEmpty();
+	    }
+	    private final int x, z;
+	    private final Section[] section;
+	    private final int[] hmap; // Height map
+	    private final int[] biome;
+	    private final Object[] biomebase;
+	    private final long captureFulltime;
+	    private final int sectionCnt;
+	    private final long inhabitedTicks;
+
+	    private static final int BLOCKS_PER_SECTION = 16 * 16 * 16;
+	    private static final int COLUMNS_PER_CHUNK = 16 * 16;
+        private static final int V1_15_BIOME_PER_CHUNK = 4 * 4 * 64;
+	    private static final byte[] emptyData = new byte[BLOCKS_PER_SECTION / 2];
+	    private static final byte[] fullData = new byte[BLOCKS_PER_SECTION / 2];
+
+	    static
+	    {
+	        Arrays.fill(fullData, (byte)0xFF);
+	    }
+	    
+	    private static byte[] dataCopy(byte[] v) {
+	    	if (Arrays.equals(v, emptyData))
+	    		return emptyData;
+	    	else if (Arrays.equals(v, fullData))
+	    		return fullData;
+	    	else
+	    		return v.clone();
+	    }
+
+	    private static class EmptySection implements Section {
+	        @Override
+	        public DynmapBlockState getBlockType(int x, int y, int z) {
+	            return DynmapBlockState.AIR;
+	        }
+	        @Override
+	        public int getBlockSkyLight(int x, int y, int z) {
+	            return 15;
+	        }
+	        @Override
+	        public int getBlockEmittedLight(int x, int y, int z) {
+	            return 0;
+	        }
+	        @Override
+	        public boolean isEmpty() {
+	            return true;
+	        }
+	    }
+	    
+	    private static final EmptySection empty_section = new EmptySection();
+	    
+	    private static class StdSection implements Section {
+	        DynmapBlockState[] states;
+	        byte[] skylight;
+	        byte[] emitlight;
+
+	        public StdSection() {
+	            states = new DynmapBlockState[BLOCKS_PER_SECTION];
+	            Arrays.fill(states,  DynmapBlockState.AIR);
+	            skylight = emptyData;
+	            emitlight = emptyData;
+	        }
+	        @Override
+	        public DynmapBlockState getBlockType(int x, int y, int z) {
+	            return states[((y & 0xF) << 8) | (z << 4) | x];
+	        }
+	        @Override
+	        public int getBlockSkyLight(int x, int y, int z) {
+	            int off = ((y & 0xF) << 7) | (z << 3) | (x >> 1);
+	            return (skylight[off] >> (4 * (x & 1))) & 0xF;
+	        }
+	        @Override
+	        public int getBlockEmittedLight(int x, int y, int z)
+	        {
+	            int off = ((y & 0xF) << 7) | (z << 3) | (x >> 1);
+	            return (emitlight[off] >> (4 * (x & 1))) & 0xF;
+	        }
+	        @Override
+	        public boolean isEmpty() {
+	            return false;
+	        }
+	    }
+	    /**
+	     * Construct empty chunk snapshot
+	     *
+	     * @param x
+	     * @param z
+	     */
+	    public NBTSnapshot(int worldheight, int x, int z, long captime, long inhabitedTime)
+	    {
+	        this.x = x;
+	        this.z = z;
+	        this.captureFulltime = captime;
+	        this.biome = new int[COLUMNS_PER_CHUNK];
+	        this.biomebase = new Object[COLUMNS_PER_CHUNK];
+	        this.sectionCnt = worldheight / 16;
+	        /* Allocate arrays indexed by section */
+	        this.section = new Section[this.sectionCnt+1];
+
+	        /* Fill with empty data */
+	        for (int i = 0; i <= this.sectionCnt; i++) {
+	            this.section[i] = empty_section;
+	        }
+
+	        /* Create empty height map */
+	        this.hmap = new int[16 * 16];
+	        
+	        this.inhabitedTicks = inhabitedTime;
+	    }
+
+	    public NBTSnapshot(NBTTagCompound nbt, int worldheight) {
+	        this.x = nbt.getInt("xPos");
+	        this.z = nbt.getInt("zPos");
+	        this.captureFulltime = 0;
+	        this.hmap = nbt.getIntArray("HeightMap");
+	        this.sectionCnt = worldheight / 16;
+	        if (nbt.hasKey("InhabitedTime")) {
+	            this.inhabitedTicks = nbt.getLong("InhabitedTime");
+	        }
+	        else {
+	            this.inhabitedTicks = 0;
+	        }
+	        /* Allocate arrays indexed by section */
+	        this.section = new Section[this.sectionCnt+1];
+	        /* Fill with empty data */
+	        for (int i = 0; i <= this.sectionCnt; i++) {
+	            this.section[i] = empty_section;
+	        }
+	        /* Get sections */
+	        NBTTagList sect = nbt.getList("Sections", 10);
+	        for (int i = 0; i < sect.size(); i++) {
+	            NBTTagCompound sec = sect.getCompound(i);
+	            int secnum = sec.getByte("Y");
+	            if (secnum >= this.sectionCnt) {
+	                //Log.info("Section " + (int) secnum + " above world height " + worldheight);
+	                continue;
+	            }
+	            if (secnum < 0)
+	            	continue;
+	            //System.out.println("section(" + secnum + ")=" + sec.asString());
+	            // Create normal section to initialize
+	            StdSection cursect = new StdSection();
+	            this.section[secnum] = cursect;
+	            DynmapBlockState[] states = cursect.states;
+	            DynmapBlockState[] palette = null;
+	            // If we've got palette and block states list, process non-empty section
+	            if (sec.hasKeyOfType("Palette", 9) && sec.hasKeyOfType("BlockStates", 12)) {
+	            	NBTTagList plist = sec.getList("Palette", 10);
+	            	long[] statelist = sec.getLongArray("BlockStates");
+	            	palette = new DynmapBlockState[plist.size()];
+	            	for (int pi = 0; pi < plist.size(); pi++) {
+	            		NBTTagCompound tc = plist.getCompound(pi);
+	            		String pname = tc.getString("Name");
+                        if (tc.hasKey("Properties")) {
+                            StringBuilder statestr = new StringBuilder();
+                            NBTTagCompound prop = tc.getCompound("Properties");
+                            for (String pid : prop.getKeys()) {
+                                if (statestr.length() > 0) statestr.append(',');
+                                statestr.append(pid).append('=').append(prop.get(pid).asString());
+                            }
+	            			palette[pi] = DynmapBlockState.getStateByNameAndState(pname, statestr.toString());
+	            		}
+	            		if (palette[pi] == null) {
+	            			palette[pi] = DynmapBlockState.getBaseStateByName(pname);
+	            		}
+	            		if (palette[pi] == null) {
+	            			palette[pi] = DynmapBlockState.AIR;
+	            		}
+	            	}
+	            	int recsperblock = (4096 + statelist.length - 1) / statelist.length;
+	            	int bitsperblock = 64 / recsperblock;
+	            	DataBits db = null;
+	            	DataBitsPacked dbp = null;
+	            	try {
+	            		db = new DataBits(bitsperblock, 4096, statelist);
+	            	} catch (Exception x) {	// Handle legacy encoded
+		            	bitsperblock = (statelist.length * 64) / 4096;
+	            		dbp = new DataBitsPacked(bitsperblock, 4096, statelist);
+	            	}
+        			if (bitsperblock > 8) {	// Not palette
+            			for (int j = 0; j < 4096; j++) {
+            				int v = (db != null) ? db.a(j) : dbp.a(j);
+            				states[j] = DynmapBlockState.getStateByGlobalIndex(v);
+            			}
+        			}
+        			else {
+            			for (int j = 0; j < 4096; j++) {
+            				int v = (db != null) ? db.a(j) : dbp.a(j);
+            				states[j] = (v < palette.length) ? palette[v] : DynmapBlockState.AIR;
+            			}
+        			}
+				}
+	            if (sec.hasKey("BlockLight")) {
+					cursect.emitlight = dataCopy(sec.getByteArray("BlockLight"));
+	            }
+				if (sec.hasKey("SkyLight")) {
+					cursect.skylight = dataCopy(sec.getByteArray("SkyLight"));
+				}
+	        }
+	        /* Get biome data */
+	        this.biome = new int[COLUMNS_PER_CHUNK];
+	        this.biomebase = new Object[COLUMNS_PER_CHUNK];
+	        Object[] bbl = BukkitVersionHelper.helper.getBiomeBaseList();
+	        if (nbt.hasKey("Biomes")) {
+            	int[] bb = nbt.getIntArray("Biomes");
+            	if (bb != null) {
+            	    // If v1.15+ format
+            	    if (bb.length > COLUMNS_PER_CHUNK) {
+            	        // For now, just pad the grid with the first 16
+                        for (int i = 0; i < COLUMNS_PER_CHUNK; i++) {
+                            int off = ((i >> 4) & 0xC) + ((i >> 2) & 0x3);
+                            int bv = bb[off + 64];   // Offset to y=64
+                            if (bv < 0) bv = 0;
+                            this.biome[i] = bv;
+                            this.biomebase[i] = bbl[bv];
+                        }
+            	    }
+            	    else { // Else, older chunks
+            	        for (int i = 0; i < bb.length; i++) {
+            	            int bv = bb[i];
+            	            if (bv < 0) bv = 0;
+            	            this.biome[i] = bv;
+            	            this.biomebase[i] = bbl[bv];
+            	        }
+            	    }
+	            }
+	        }
+	    }
+	    
+	    public int getX()
+	    {
+	        return x;
+	    }
+
+	    public int getZ()
+	    {
+	        return z;
+	    }
+	    
+	    public DynmapBlockState getBlockType(int x, int y, int z)
+	    {
+	        return section[y >> 4].getBlockType(x, y, z);
+	    }
+
+	    public int getBlockSkyLight(int x, int y, int z)
+	    {
+	        return section[y >> 4].getBlockSkyLight(x, y, z);
+	    }
+
+	    public int getBlockEmittedLight(int x, int y, int z)
+	    {
+	        return section[y >> 4].getBlockEmittedLight(x, y, z);
+	    }
+
+	    public int getHighestBlockYAt(int x, int z)
+	    {
+	        return hmap[z << 4 | x];
+	    }
+
+	    public final long getCaptureFullTime()
+	    {
+	        return captureFulltime;
+	    }
+
+	    public boolean isSectionEmpty(int sy)
+	    {
+	        return section[sy].isEmpty();
+	    }
+	    
+	    public long getInhabitedTicks() {
+	        return inhabitedTicks;
+	    }
+
+		@Override
+		public Biome getBiome(int x, int z) {
+	        return AbstractMapChunkCache.getBiomeByID(biome[z << 4 | x]);
+		}
+
+		@Override
+		public Object[] getBiomeBaseFromSnapshot() {
+			return this.biomebase;
+		}
+	}
+	
+    private NBTTagCompound fetchLoadedChunkNBT(World w, int x, int z) {
+        CraftWorld cw = (CraftWorld) w;
+        NBTTagCompound nbt = null;
+        if (cw.isChunkLoaded(x, z)) {
+            Chunk c = cw.getHandle().getChunkAt(x,  z);
+            if ((c != null) && c.h) {	// c.loaded
+                nbt = ChunkRegionLoader.saveChunk(cw.getHandle(), c);
+            }
+        }
+        if (nbt != null) {
+            nbt = nbt.getCompound("Level");
+            if (nbt != null) {
+                String stat = nbt.getString("Status");
+				ChunkStatus cs = ChunkStatus.a(stat);
+                if ((stat == null) || (!cs.b(ChunkStatus.j))) {	// ChunkStatus.LIGHT
+                    nbt = null;
+                }
+            }
+        }
+        return nbt;
+    }
+    
+    private NBTTagCompound loadChunkNBT(World w, int x, int z) {
+        CraftWorld cw = (CraftWorld) w;
+        NBTTagCompound nbt = null;
+        ChunkCoordIntPair cc = new ChunkCoordIntPair(x, z);
+        try {
+            nbt = cw.getHandle().getChunkProvider().a.read(cc);	// playerChunkMap
+        } catch (IOException iox) {
+        }
+        if (nbt != null) {
+            nbt = nbt.getCompound("Level");
+            if (nbt != null) {
+            	String stat = nbt.getString("Status");
+            	if ((stat == null) || (stat.equals("full") == false)) {
+                    nbt = null;
+                    if ((stat == null) || stat.equals("") && DynmapCore.migrateChunks()) {
+                        Chunk c = cw.getHandle().getChunkAt(x, z);
+                        if (c != null) {
+                            nbt = fetchLoadedChunkNBT(w, x, z);
+                            cw.getHandle().unloadChunk(c);
+                        }
+                    }
+            	}
+            }
+        }
+        return nbt;
+    }   
+    
+    @Override
+    public Snapshot wrapChunkSnapshot(ChunkSnapshot css) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+    
+    // Load chunk snapshots
+    @Override
+    public int loadChunks(int max_to_load) {
+        if(dw.isLoaded() == false)
+            return 0;        
+        int cnt = 0;
+        if(iterator == null)
+            iterator = chunks.listIterator();
+
+        DynmapCore.setIgnoreChunkLoads(true);
+        // Load the required chunks.
+        while((cnt < max_to_load) && iterator.hasNext()) {
+            long startTime = System.nanoTime();
+            DynmapChunk chunk = iterator.next();
+            boolean vis = true;
+            if(visible_limits != null) {
+                vis = false;
+                for(VisibilityLimit limit : visible_limits) {
+                    if (limit.doIntersectChunk(chunk.x, chunk.z)) {
+                        vis = true;
+                        break;
+                    }
+                }
+            }
+            if(vis && (hidden_limits != null)) {
+                for(VisibilityLimit limit : hidden_limits) {
+                    if (limit.doIntersectChunk(chunk.x, chunk.z)) {
+                        vis = false;
+                        break;
+                    }
+                }
+            }
+            /* Check if cached chunk snapshot found */
+            Snapshot ss = null;
+            long inhabited_ticks = 0;
+            DynIntHashMap tileData = null;
+            int idx = (chunk.x-x_min) + (chunk.z - z_min)*x_dim;
+            SnapshotRec ssr = SnapshotCache.sscache.getSnapshot(dw.getName(), chunk.x, chunk.z, blockdata, biome, biomeraw, highesty); 
+            if(ssr != null) {
+                inhabited_ticks = ssr.inhabitedTicks;
+                if(!vis) {
+                    if(hidestyle == HiddenChunkStyle.FILL_STONE_PLAIN)
+                        ss = STONE;
+                    else if(hidestyle == HiddenChunkStyle.FILL_OCEAN)
+                        ss = OCEAN;
+                    else
+                        ss = EMPTY;
+                }
+                else {
+                    ss = ssr.ss;
+                }
+                snaparray[idx] = ss;
+                snaptile[idx] = ssr.tileData;
+                inhabitedTicks[idx] = inhabited_ticks;
+                
+                endChunkLoad(startTime, ChunkStats.CACHED_SNAPSHOT_HIT);
+                continue;
+            }
+            // Fetch NTB for chunk if loaded
+            NBTTagCompound nbt = fetchLoadedChunkNBT(w, chunk.x, chunk.z); 
+            boolean did_load = false;
+            if (nbt == null) {
+                // Load NTB for chunk, if it exists
+                nbt = loadChunkNBT(w, chunk.x, chunk.z);
+                did_load = true;
+            }
+            if (nbt != null) {
+                NBTSnapshot nss = new NBTSnapshot(nbt, w.getMaxHeight());
+                ss = nss;
+                inhabited_ticks = nss.getInhabitedTicks();
+                if(!vis) {
+                    if(hidestyle == HiddenChunkStyle.FILL_STONE_PLAIN)
+                        ss = STONE;
+                    else if(hidestyle == HiddenChunkStyle.FILL_OCEAN)
+                        ss = OCEAN;
+                    else
+                        ss = EMPTY;
+                }
+            }
+            else {
+                ss = EMPTY;
+            }
+            ssr = new SnapshotRec();
+            ssr.ss = ss;
+            ssr.inhabitedTicks = inhabited_ticks;
+            ssr.tileData = tileData;
+            SnapshotCache.sscache.putSnapshot(dw.getName(), chunk.x, chunk.z, ssr, blockdata, biome, biomeraw, highesty);
+            snaparray[idx] = ss;
+            snaptile[idx] = ssr.tileData;
+            inhabitedTicks[idx] = inhabited_ticks;
+            if (nbt == null)
+                endChunkLoad(startTime, ChunkStats.UNGENERATED_CHUNKS);
+            else if (did_load)
+                endChunkLoad(startTime, ChunkStats.UNLOADED_CHUNKS);
+            else
+                endChunkLoad(startTime, ChunkStats.LOADED_CHUNKS);
+            cnt++;
+        }
+        DynmapCore.setIgnoreChunkLoads(false);
+
+        if(iterator.hasNext() == false) {   /* If we're done */
+            isempty = true;
+            /* Fill missing chunks with empty dummy chunk */
+            for(int i = 0; i < snaparray.length; i++) {
+                if(snaparray[i] == null)
+                    snaparray[i] = EMPTY;
+                else if(snaparray[i] != EMPTY)
+                    isempty = false;
+            }
+        }
+
+        return cnt;
+    }
+}
diff --git a/settings.gradle b/settings.gradle
index e6c70933..f4c7724b 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -7,6 +7,7 @@ include ':bukkit-helper-116'
 include ':bukkit-helper-116-2'
 include ':bukkit-helper-116-3'
 include ':bukkit-helper-116-4'
+include ':bukkit-helper-117'
 include ':bukkit-helper'
 include ':dynmap-api'
 include ':DynmapCore'
@@ -16,16 +17,16 @@ include ':fabric-1.16.2'
 include ':fabric-1.16.1'
 include ':fabric-1.15.2'
 include ':fabric-1.14.4'
-include ':forge-1.16.5'
-include ':forge-1.16.4'
-include ':forge-1.16.3'
-include ':forge-1.16.2'
-include ':forge-1.16.1'
-include ':forge-1.15.2'
-include ':forge-1.14.4'
-include ':forge-1.13.2'
-include ':forge-1.12.2'
-include ':forge-1.11.2'
+//include ':forge-1.16.5'
+//include ':forge-1.16.4'
+//include ':forge-1.16.3'
+//include ':forge-1.16.2'
+//include ':forge-1.16.1'
+//include ':forge-1.15.2'
+//include ':forge-1.14.4'
+//include ':forge-1.13.2'
+//include ':forge-1.12.2'
+//include ':forge-1.11.2'
 
 project(':spigot').projectDir = "$rootDir/spigot" as File
 project(':bukkit-helper-113-2').projectDir = "$rootDir/bukkit-helper-113-2" as File
@@ -35,6 +36,7 @@ project(':bukkit-helper-116').projectDir = "$rootDir/bukkit-helper-116" as File
 project(':bukkit-helper-116-2').projectDir = "$rootDir/bukkit-helper-116-2" as File
 project(':bukkit-helper-116-3').projectDir = "$rootDir/bukkit-helper-116-3" as File
 project(':bukkit-helper-116-4').projectDir = "$rootDir/bukkit-helper-116-4" as File
+project(':bukkit-helper-117').projectDir = "$rootDir/bukkit-helper-117" as File
 project(':bukkit-helper').projectDir = "$rootDir/bukkit-helper" as File
 project(':dynmap-api').projectDir = "$rootDir/dynmap-api" as File
 project(':DynmapCore').projectDir = "$rootDir/DynmapCore" as File
@@ -44,13 +46,14 @@ project(':fabric-1.16.2').projectDir = "$rootDir/fabric-1.16.2" as File
 project(':fabric-1.16.1').projectDir = "$rootDir/fabric-1.16.1" as File
 project(':fabric-1.15.2').projectDir = "$rootDir/fabric-1.15.2" as File
 project(':fabric-1.14.4').projectDir = "$rootDir/fabric-1.14.4" as File
-project(':forge-1.16.5').projectDir = "$rootDir/forge-1.16.5" as File
-project(':forge-1.16.4').projectDir = "$rootDir/forge-1.16.4" as File
-project(':forge-1.16.3').projectDir = "$rootDir/forge-1.16.3" as File
-project(':forge-1.16.2').projectDir = "$rootDir/forge-1.16.2" as File
-project(':forge-1.16.1').projectDir = "$rootDir/forge-1.16.1" as File
-project(':forge-1.15.2').projectDir = "$rootDir/forge-1.15.2" as File
-project(':forge-1.14.4').projectDir = "$rootDir/forge-1.14.4" as File
-project(':forge-1.13.2').projectDir = "$rootDir/forge-1.13.2" as File
-project(':forge-1.12.2').projectDir = "$rootDir/forge-1.12.2" as File
-project(':forge-1.11.2').projectDir = "$rootDir/forge-1.11.2" as File
+//project(':forge-1.16.5').projectDir = "$rootDir/forge-1.16.5" as File
+//project(':forge-1.16.4').projectDir = "$rootDir/forge-1.16.4" as File
+//project(':forge-1.16.3').projectDir = "$rootDir/forge-1.16.3" as File
+//project(':forge-1.16.2').projectDir = "$rootDir/forge-1.16.2" as File
+//project(':forge-1.16.1').projectDir = "$rootDir/forge-1.16.1" as File
+//project(':forge-1.15.2').projectDir = "$rootDir/forge-1.15.2" as File
+//project(':forge-1.14.4').projectDir = "$rootDir/forge-1.14.4" as File
+//project(':forge-1.13.2').projectDir = "$rootDir/forge-1.13.2" as File
+//project(':forge-1.12.2').projectDir = "$rootDir/forge-1.12.2" as File
+//project(':forge-1.11.2').projectDir = "$rootDir/forge-1.11.2" as File
+
diff --git a/spigot/build.gradle b/spigot/build.gradle
index 94cd4451..18b2e554 100644
--- a/spigot/build.gradle
+++ b/spigot/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     compile 'me.lucko.luckperms:luckperms-api:4.3'
     compile 'net.luckperms:api:5.0'
     compile('com.github.MilkBowl:VaultAPI:1.7') { transitive = false }
-    compileOnly 'net.skinsrestorer:skinsrestorer:14.0.0-SNAPSHOT@jar'
+    compileOnly 'net.skinsrestorer:skinsrestorer:14.1.0-SNAPSHOT@jar'
     compile project(":dynmap-api")
     compile project(path: ":DynmapCore", configuration: "shadow")
     compile group: 'ru.tehkode', name: 'PermissionsEx', version: '1.19.1'
@@ -47,6 +47,9 @@ dependencies {
     implementation(project(':bukkit-helper-116-4')) {
         transitive = false
     }
+    implementation(project(':bukkit-helper-117')) {
+        transitive = false
+    }
 }
 
 processResources {
@@ -78,6 +81,7 @@ shadowJar {
         include(dependency(':bukkit-helper-116-2'))
         include(dependency(':bukkit-helper-116-3'))
         include(dependency(':bukkit-helper-116-4'))
+        include(dependency(':bukkit-helper-117'))
     }
     relocate('org.bstats', 'org.dynmap.bstats')
     destinationDir = file '../target'
diff --git a/spigot/src/main/java/org/dynmap/bukkit/DynmapPlugin.java b/spigot/src/main/java/org/dynmap/bukkit/DynmapPlugin.java
index ec4d72f9..b095e908 100644
--- a/spigot/src/main/java/org/dynmap/bukkit/DynmapPlugin.java
+++ b/spigot/src/main/java/org/dynmap/bukkit/DynmapPlugin.java
@@ -917,10 +917,10 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
                 if (skinsRestorer == null) {
                     Log.warning("SkinsRestorer integration can't be enabled because SkinsRestorer not installed");
                 } else {
-                    skinUrlProvider = new SkinsRestorerSkinUrlProvider(skinsRestorer);
+                    skinUrlProvider = new SkinsRestorerSkinUrlProvider();
                     Log.info("SkinsRestorer API v14 integration enabled");
                 }
-            }catch(NoClassDefFoundError e) {
+            } catch(NoClassDefFoundError e) {
                 Log.warning("You are using unsupported version of SkinsRestorer. Use v14 or newer.");
                 Log.warning("Disabled SkinsRestorer integration for this session");
             }
diff --git a/spigot/src/main/java/org/dynmap/bukkit/Helper.java b/spigot/src/main/java/org/dynmap/bukkit/Helper.java
index 2e78c027..495d3b4b 100644
--- a/spigot/src/main/java/org/dynmap/bukkit/Helper.java
+++ b/spigot/src/main/java/org/dynmap/bukkit/Helper.java
@@ -12,6 +12,7 @@ import org.dynmap.bukkit.helper.v116.BukkitVersionHelperSpigot116;
 import org.dynmap.bukkit.helper.v116_2.BukkitVersionHelperSpigot116_2;
 import org.dynmap.bukkit.helper.v116_3.BukkitVersionHelperSpigot116_3;
 import org.dynmap.bukkit.helper.v116_4.BukkitVersionHelperSpigot116_4;
+import org.dynmap.bukkit.helper.v117.BukkitVersionHelperSpigot117;
 
 public class Helper {
 
@@ -37,6 +38,9 @@ public class Helper {
                 Log.info("Loading Glowstone support");
                 BukkitVersionHelper.helper = new BukkitVersionHelperGlowstone();
             }
+            else if (v.contains("(MC: 1.17")) {
+                BukkitVersionHelper.helper = new BukkitVersionHelperSpigot117();
+            }
             else if (v.contains("(MC: 1.16.1")) {
                 BukkitVersionHelper.helper = new BukkitVersionHelperSpigot116();
             }
diff --git a/spigot/src/main/java/org/dynmap/bukkit/SkinsRestorerSkinUrlProvider.java b/spigot/src/main/java/org/dynmap/bukkit/SkinsRestorerSkinUrlProvider.java
index a1d65291..f3ac7ffd 100644
--- a/spigot/src/main/java/org/dynmap/bukkit/SkinsRestorerSkinUrlProvider.java
+++ b/spigot/src/main/java/org/dynmap/bukkit/SkinsRestorerSkinUrlProvider.java
@@ -17,9 +17,9 @@ public class SkinsRestorerSkinUrlProvider implements SkinUrlProvider {
     private JSONParser mJsonParser;
     private SkinsRestorerAPI mSkinsRestorerApi;
 
-    SkinsRestorerSkinUrlProvider(SkinsRestorer skinsRestorer) {
+    SkinsRestorerSkinUrlProvider() {
         mJsonParser = new JSONParser();
-        mSkinsRestorerApi = skinsRestorer.getSkinsRestorerBukkitAPI();
+        mSkinsRestorerApi = SkinsRestorerAPI.getApi();
     }
 
     @Override