diff --git a/DynmapCore/src/main/resources/models_1.txt b/DynmapCore/src/main/resources/models_1.txt
index 4ddbe353..7b2e7dab 100644
--- a/DynmapCore/src/main/resources/models_1.txt
+++ b/DynmapCore/src/main/resources/models_1.txt
@@ -1297,8 +1297,13 @@ patchblock:id=beetroots,patch0=VertX075,patch1=VertX075@90,patch2=VertX025,patch
 # 1.13 blocks
 
 # Kelp
+modellist:id=%kelp,box=0.800000/0.000000/8.000000/false:15.200000/16.000000/8.000000/0.000000/45.000000/0.000000/8.000000/8.000000/8.000000:n/0/0.000000/0.000000/16.000000/16.000000:s/0/0.000000/0.000000/16.000000/16.000000,box=8.000000/0.000000/0.800000/false:8.000000/16.000000/15.200000/0.000000/45.000000/0.000000/8.000000/8.000000/8.000000:w/0/0.000000/0.000000/16.000000/16.000000:e/0/0.000000/0.000000/16.000000/16.000000
+
 # Kelp Plant
-patchblock:id=kelp,id=kelp_plant,patch0=VertX1Z0ToX0Z1,patch1=VertX1Z0ToX0Z1@90
+modellist:id=%kelp_plant,box=0.800000/0.000000/8.000000/false:15.200000/16.000000/8.000000/0.000000/45.000000/0.000000/8.000000/8.000000/8.000000:n/0/0.000000/0.000000/16.000000/16.000000:s/0/0.000000/0.000000/16.000000/16.000000,box=8.000000/0.000000/0.800000/false:8.000000/16.000000/15.200000/0.000000/45.000000/0.000000/8.000000/8.000000/8.000000:w/0/0.000000/0.000000/16.000000/16.000000:e/0/0.000000/0.000000/16.000000/16.000000
+
+# Dried kelp block
+modellist:id=%dried_kelp_block,box=0.000000/0.000000/0.000000:16.000000/16.000000/16.000000:d/1:w/0:e/0/16.000000/0.000000/0.000000/16.000000:n/0:u/2:s/0/16.000000/0.000000/0.000000/16.000000
 
 # Turtle egg - single
 customblock:id=turtle_egg,data=0,data=1,data=2,class=org.dynmap.hdmap.renderer.CuboidRenderer,cuboid0=0.3125:0:0.25/0.625:0.4275:0.5625
@@ -2201,17 +2206,7 @@ patchblock:id=bubble_column
 # Scolk Sensor (inactive) (sculk_sensor_bottom, sculk_sensor_side, sculk_sensor_tendril_inactive/active, sculk_sensor_top)
 [1.17-]modellist:id=sculk_sensor,data=*,box=0/0/0:16/8/16:n/1/0/8/16/16:e/1/0/8/16/16:s/1/0/8/16/16:w/1/0/8/16/16:u/3/0/0/16/16:d/0/0/0/16/16,box=-1/8/3:7/16/3/0/45/0/3/12/3:n/2/4/8/12/16:s/2/12/8/4/16,box=9/8/3:17/16/3/0/-45/0/13/12/3:n/2/12/8/4/16:s/2/4/8/12/16,box=9/8/13:17/16/13/0/45/0/13/12/13:n/2/12/8/4/16:s/2/4/8/12/16,box=-1/8/13:7/16/13/0/-45/0/3/12/13:n/2/4/8/12/16:s/2/12/8/4/16
 # Spore Blossom
-[1.17-]patch:id=patch812,Ox=0.062500,Oy=0.993750,Oz=0.062500,Ux=0.937500,Uy=0.993750,Uz=0.062500,Vx=0.062500,Vy=0.993750,Vz=0.937500,Umin=0.000000,Umax=1.000000,Vmin=0.000000,Vmax=1.000000,VmaxAtUMax=1.000000,VminAtUMax=0.000000,visibility=top
-[1.17-]patch:id=patch813,Ox=0.062500,Oy=0.993750,Oz=0.937500,Ux=0.937500,Uy=0.993750,Uz=0.937500,Vx=0.062500,Vy=0.993750,Vz=0.062500,Umin=0.000000,Umax=1.000000,Vmin=0.000000,Vmax=1.000000,VmaxAtUMax=1.000000,VminAtUMax=0.000000,visibility=top
-[1.17-]patch:id=patch814,Ox=0.507175,Oy=0.982677,Oz=0.000000,Ux=1.431055,Uy=1.365361,Uz=0.000000,Vx=0.507175,Vy=0.982677,Vz=1.000000,Umin=0.000000,Umax=1.000000,Vmin=0.000000,Vmax=1.000000,VmaxAtUMax=1.000000,VminAtUMax=0.000000,visibility=top
-[1.17-]patch:id=patch815,Ox=0.507175,Oy=0.982677,Oz=1.000000,Ux=1.431055,Uy=1.365361,Uz=1.000000,Vx=0.507175,Vy=0.982677,Vz=0.000000,Umin=0.000000,Umax=1.000000,Vmin=0.000000,Vmax=1.000000,VmaxAtUMax=1.000000,VminAtUMax=0.000000,visibility=top
-[1.17-]patch:id=patch816,Ox=-0.431055,Oy=1.365361,Oz=0.000000,Ux=0.492825,Uy=0.982677,Uz=0.000000,Vx=-0.431055,Vy=1.365361,Vz=1.000000,Umin=0.000000,Umax=1.000000,Vmin=0.000000,Vmax=1.000000,VmaxAtUMax=1.000000,VminAtUMax=0.000000,visibility=top
-[1.17-]patch:id=patch817,Ox=-0.431055,Oy=1.365361,Oz=1.000000,Ux=0.492825,Uy=0.982677,Uz=1.000000,Vx=-0.431055,Vy=1.365361,Vz=0.000000,Umin=0.000000,Umax=1.000000,Vmin=0.000000,Vmax=1.000000,VmaxAtUMax=1.000000,VminAtUMax=0.000000,visibility=top
-[1.17-]patch:id=patch818,Ox=0.000000,Oy=0.982677,Oz=0.507175,Ux=1.000000,Uy=0.982677,Uz=0.507175,Vx=0.000000,Vy=1.365361,Vz=1.431055,Umin=0.000000,Umax=1.000000,Vmin=0.000000,Vmax=1.000000,VmaxAtUMax=1.000000,VminAtUMax=0.000000,visibility=top
-[1.17-]patch:id=patch819,Ox=0.000000,Oy=1.365361,Oz=1.431055,Ux=1.000000,Uy=1.365361,Uz=1.431055,Vx=0.000000,Vy=0.982677,Vz=0.507175,Umin=0.000000,Umax=1.000000,Vmin=0.000000,Vmax=1.000000,VmaxAtUMax=1.000000,VminAtUMax=0.000000,visibility=top
-[1.17-]patch:id=patch820,Ox=0.000000,Oy=1.365361,Oz=-0.431055,Ux=1.000000,Uy=1.365361,Uz=-0.431055,Vx=0.000000,Vy=0.982677,Vz=0.492825,Umin=0.000000,Umax=1.000000,Vmin=0.000000,Vmax=1.000000,VmaxAtUMax=1.000000,VminAtUMax=0.000000,visibility=top
-[1.17-]patch:id=patch821,Ox=0.000000,Oy=0.982677,Oz=0.492825,Ux=1.000000,Uy=0.982677,Uz=0.492825,Vx=0.000000,Vy=1.365361,Vz=-0.431055,Umin=0.000000,Umax=1.000000,Vmin=0.000000,Vmax=1.000000,VmaxAtUMax=1.000000,VminAtUMax=0.000000,visibility=top
-[1.17-]patchblock:id=%spore_blossom,data=0,patch0=patch812,patch1=patch813,patch2=patch814,patch3=patch815,patch4=patch816,patch5=patch817,patch6=patch818,patch7=patch819,patch8=patch820,patch9=patch821
+[1.17-]modellist:id=%spore_blossom,box=1.000000/15.900000/1.000000/false:15.000000/15.900000/15.000000:u/0/1.000000/1.000000/15.000000/15.000000:d/0/1.000000/1.000000/15.000000/15.000000,box=8.000000/15.700000/0.000000/false:24.000000/15.700000/16.000000/0.000000/0.000000/-22.500000/8.000000/16.000000/0.000000:u90/1/0.000000/0.000000/16.000000/16.000000:d270/1/0.000000/16.000000/16.000000/0.000000,box=-8.000000/15.700000/0.000000/false:8.000000/15.700000/16.000000/0.000000/0.000000/22.500000/8.000000/16.000000/0.000000:u270/1/0.000000/0.000000/16.000000/16.000000:d90/1/0.000000/16.000000/16.000000/0.000000,box=0.000000/15.700000/8.000000/false:16.000000/15.700000/24.000000/22.500000/0.000000/0.000000/0.000000/16.000000/8.000000:u/1/16.000000/16.000000/0.000000/0.000000:d/1/16.000000/0.000000/0.000000/16.000000,box=0.000000/15.700000/-8.000000/false:16.000000/15.700000/8.000000/-22.500000/0.000000/0.000000/0.000000/16.000000/8.000000:u/1/0.000000/0.000000/16.000000/16.000000:d/1/0.000000/16.000000/16.000000/0.000000
 # Azalea
 [1.17-]patch:id=patch822,Ox=0.000000,Oy=1.000000,Oz=0.000000,Ux=1.000000,Uy=1.000000,Uz=0.000000,Vx=0.000000,Vy=1.000000,Vz=1.000000,Umin=0.000000,Umax=1.000000,Vmin=0.000000,Vmax=1.000000,VmaxAtUMax=1.000000,VminAtUMax=0.000000,visibility=top
 [1.17-]patch:id=patch823,Ox=0.000000,Oy=1.000000,Oz=1.000000,Ux=1.000000,Uy=1.000000,Uz=1.000000,Vx=0.000000,Vy=1.000000,Vz=0.000000,Umin=0.000000,Umax=1.000000,Vmin=0.000000,Vmax=1.000000,VmaxAtUMax=1.000000,VminAtUMax=0.000000,visibility=top
diff --git a/DynmapCore/src/main/resources/texture_1.txt b/DynmapCore/src/main/resources/texture_1.txt
index 1410e08f..dee8d1fc 100644
--- a/DynmapCore/src/main/resources/texture_1.txt
+++ b/DynmapCore/src/main/resources/texture_1.txt
@@ -1,11 +1,22 @@
 # Mapping of texture resources to block ID and data values (v1.13-)
 version:1.13-
 # block:id=<block-id>,data=<data-val|*>,top=<index>,bottom=<index>,north=<index>,south=<index>,east=<index>,west=<index>,allfaces=<index>,allsides=<index>
-# <index>=0-255 (index of patch in terrain.png), -1=clear, 1xxx=biome tint from grasscolor.png,257=stationary water,258=moving water,
-#      259=stationary lava,260=moving lava,261=extended piston side,262=piston side while extended,263=glass pane top,2xxx=biome tint from foliagecolor.png,4xxx=rotate texture 90,
-#      5xxx=rotate texture 180, 6xxx=rotate texture 270, 7xxx=flip texture horizontally, 8xxx=shift down 1/2 block, 9=shift down 1/2,flip horiz,
-#      10xxx=inclined-torch,11xxx=grass-side,12xxx=clear if same block,3xxx=biome tint from watercolor.png, 13xxx=pine tone, 14xxx=birch tone, 15xxx=lily tone,
-#      264=air portal with eye, 265=fire texture
+# <index>=0-255 (index of patch in terrain.png), -1=clear, 
+#	1xxx=biome tint from grasscolor.png,
+#   2xxx=biome tint from foliagecolor.png,
+#   3xxx=biome tint from watercolor.png
+#   4xxx=rotate texture 90,
+#   5xxx=rotate texture 180,
+#   6xxx=rotate texture 270,
+#   7xxx=flip texture horizontally, 
+#   8xxx=shift down 1/2 block, 
+#   9xxx=shift down 1/2,flip horiz,
+#  10xxx=inclined-torch,
+#  11xxx=grass-side,
+#  12xxx=clear if same block,
+#  13xxx=pine tone, 
+#  14xxx=birch tone, 
+#  15xxx=lily tone,
 texture:id=foliagebiome,filename=assets/minecraft/textures/colormap/foliage.png,xcount=1,ycount=1,format=BIOME
 texture:id=grassbiome,filename=assets/minecraft/textures/colormap/grass.png,xcount=1,ycount=1,format=BIOME
 texturefile:id=chest,filename=assets/minecraft/textures/entity/chest/normal.png,format=CHEST
@@ -1866,13 +1877,13 @@ texture:id=sea_pickle
 texture:id=conduit
 
 # Kelp
-block:id=kelp,patch0-1=1000:kelp,transparency=TRANSPARENT
+block:id=%kelp,patch0=3000:kelp,transparency=SEMITRANSPARENT,stdrot=true
 
 # Kelp plant
-block:id=kelp_plant,patch0-1=1000:kelp_plant,transparency=TRANSPARENT
+block:id=%kelp_plant,patch0=3000:kelp_plant,transparency=SEMITRANSPARENT,stdrot=true
 
 # Dried kelp block
-block:id=dried_kelp_block,allsides=0:dried_kelp_side,top=0:dried_kelp_top,bottom=0:dried_kelp_bottom,stdrot=true
+block:id=%dried_kelp_block,patch0=0:dried_kelp_side,patch1=0:dried_kelp_bottom,patch2=0:dried_kelp_top,stdrot=true
 
 # Turtle egg
 block:id=turtle_egg,data=0,data=3,data=6,data=9,patch0-5=0:turtle_egg,transparency=TRANSPARENT
@@ -3085,7 +3096,7 @@ block:id=black_banner,id=black_wall_banner,data=*,patch0=0:oak_planks,patch1=0:b
 # Spore blossom
 [1.17-]texture:id=spore_blossom_base
 [1.17-]texture:id=spore_blossom
-[1.17-]block:id=%spore_blossom,data=0,patch0=0:spore_blossom_base,patch1=0:spore_blossom_base,patch2=4000:spore_blossom,patch3=6000:spore_blossom,patch4=6000:spore_blossom,patch5=4000:spore_blossom,patch6=0:spore_blossom,patch7=0:spore_blossom,patch8=0:spore_blossom,patch9=0:spore_blossom,transparency=TRANSPARENT,stdrot=true
+[1.17-]block:id=%spore_blossom,patch0=0:spore_blossom_base,patch1=0:spore_blossom,transparency=TRANSPARENT,stdrot=true
 # Azalea
 [1.17-]texture:id=azalea_top
 [1.17-]texture:id=azalea_side