diff --git a/assets/world/tree/temperate_birch/1.vox b/assets/world/tree/birch/1.vox
similarity index 100%
rename from assets/world/tree/temperate_birch/1.vox
rename to assets/world/tree/birch/1.vox
diff --git a/assets/world/tree/temperate_birch/10.vox b/assets/world/tree/birch/10.vox
similarity index 100%
rename from assets/world/tree/temperate_birch/10.vox
rename to assets/world/tree/birch/10.vox
diff --git a/assets/world/tree/temperate_birch/11.vox b/assets/world/tree/birch/11.vox
similarity index 100%
rename from assets/world/tree/temperate_birch/11.vox
rename to assets/world/tree/birch/11.vox
diff --git a/assets/world/tree/temperate_birch/12.vox b/assets/world/tree/birch/12.vox
similarity index 100%
rename from assets/world/tree/temperate_birch/12.vox
rename to assets/world/tree/birch/12.vox
diff --git a/assets/world/tree/birch/2.vox b/assets/world/tree/birch/2.vox
new file mode 100644
index 0000000000..8c31e8e085
--- /dev/null
+++ b/assets/world/tree/birch/2.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:54f523a89cbf01714d2c04ac1e004d0e578df65a644680aed63f58ab5fbc293d
+size 52160
diff --git a/assets/world/tree/temperate_birch/3.vox b/assets/world/tree/birch/3.vox
similarity index 100%
rename from assets/world/tree/temperate_birch/3.vox
rename to assets/world/tree/birch/3.vox
diff --git a/assets/world/tree/temperate_birch/4.vox b/assets/world/tree/birch/4.vox
similarity index 100%
rename from assets/world/tree/temperate_birch/4.vox
rename to assets/world/tree/birch/4.vox
diff --git a/assets/world/tree/temperate_birch/5.vox b/assets/world/tree/birch/5.vox
similarity index 100%
rename from assets/world/tree/temperate_birch/5.vox
rename to assets/world/tree/birch/5.vox
diff --git a/assets/world/tree/temperate_birch/6.vox b/assets/world/tree/birch/6.vox
similarity index 100%
rename from assets/world/tree/temperate_birch/6.vox
rename to assets/world/tree/birch/6.vox
diff --git a/assets/world/tree/temperate_birch/7.vox b/assets/world/tree/birch/7.vox
similarity index 100%
rename from assets/world/tree/temperate_birch/7.vox
rename to assets/world/tree/birch/7.vox
diff --git a/assets/world/tree/temperate_birch/8.vox b/assets/world/tree/birch/8.vox
similarity index 100%
rename from assets/world/tree/temperate_birch/8.vox
rename to assets/world/tree/birch/8.vox
diff --git a/assets/world/tree/temperate_birch/9.vox b/assets/world/tree/birch/9.vox
similarity index 100%
rename from assets/world/tree/temperate_birch/9.vox
rename to assets/world/tree/birch/9.vox
diff --git a/assets/world/tree/mangroves/1.vox b/assets/world/tree/mangroves/1.vox
new file mode 100644
index 0000000000..be7eb7b108
--- /dev/null
+++ b/assets/world/tree/mangroves/1.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:20dfbe66e06a086287d41285be91e355a3304bfb5b5c6734748b083b26ee677e
+size 82320
diff --git a/assets/world/tree/mangroves/2.vox b/assets/world/tree/mangroves/2.vox
new file mode 100644
index 0000000000..b344a2c757
--- /dev/null
+++ b/assets/world/tree/mangroves/2.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ba097fba04c94b2184352222c65677da0fe663f249cd072424b780ab83eab227
+size 72044
diff --git a/assets/world/tree/mangroves/3.vox b/assets/world/tree/mangroves/3.vox
new file mode 100644
index 0000000000..dea5bc53ab
--- /dev/null
+++ b/assets/world/tree/mangroves/3.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:20846e8a910b4a230fee731f851c24e3e5c273c7f980cebcbc90485838d4a36d
+size 97240
diff --git a/assets/world/tree/temperate_oak_green/1.vox b/assets/world/tree/oak_green/1.vox
similarity index 100%
rename from assets/world/tree/temperate_oak_green/1.vox
rename to assets/world/tree/oak_green/1.vox
diff --git a/assets/world/tree/temperate_oak_green/2.vox b/assets/world/tree/oak_green/2.vox
similarity index 100%
rename from assets/world/tree/temperate_oak_green/2.vox
rename to assets/world/tree/oak_green/2.vox
diff --git a/assets/world/tree/temperate_oak_green/3.vox b/assets/world/tree/oak_green/3.vox
similarity index 100%
rename from assets/world/tree/temperate_oak_green/3.vox
rename to assets/world/tree/oak_green/3.vox
diff --git a/assets/world/tree/temperate_oak_green/4.vox b/assets/world/tree/oak_green/4.vox
similarity index 100%
rename from assets/world/tree/temperate_oak_green/4.vox
rename to assets/world/tree/oak_green/4.vox
diff --git a/assets/world/tree/temperate_oak_green/5.vox b/assets/world/tree/oak_green/5.vox
similarity index 100%
rename from assets/world/tree/temperate_oak_green/5.vox
rename to assets/world/tree/oak_green/5.vox
diff --git a/assets/world/tree/temperate_oak_green/6.vox b/assets/world/tree/oak_green/6.vox
similarity index 100%
rename from assets/world/tree/temperate_oak_green/6.vox
rename to assets/world/tree/oak_green/6.vox
diff --git a/assets/world/tree/temperate_oak_green/7.vox b/assets/world/tree/oak_green/7.vox
similarity index 100%
rename from assets/world/tree/temperate_oak_green/7.vox
rename to assets/world/tree/oak_green/7.vox
diff --git a/assets/world/tree/temperate_oak_green/8.vox b/assets/world/tree/oak_green/8.vox
similarity index 100%
rename from assets/world/tree/temperate_oak_green/8.vox
rename to assets/world/tree/oak_green/8.vox
diff --git a/assets/world/tree/temperate_oak_green/9.vox b/assets/world/tree/oak_green/9.vox
similarity index 100%
rename from assets/world/tree/temperate_oak_green/9.vox
rename to assets/world/tree/oak_green/9.vox
diff --git a/assets/world/tree/pine_blue/1.vox b/assets/world/tree/pine_blue/1.vox
new file mode 100644
index 0000000000..f140c85442
--- /dev/null
+++ b/assets/world/tree/pine_blue/1.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:19fc092bec5986dea9284e7b10d5c5d2e8cb829755833168ba845b4b24c76ecd
+size 50576
diff --git a/assets/world/tree/pine_blue/2.vox b/assets/world/tree/pine_blue/2.vox
new file mode 100644
index 0000000000..eb80d98ac3
--- /dev/null
+++ b/assets/world/tree/pine_blue/2.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:77ee6915a4df161a38c2ca922bc3a10dbf469799eab17f36e271869709a31d52
+size 54148
diff --git a/assets/world/tree/pine_blue/3.vox b/assets/world/tree/pine_blue/3.vox
new file mode 100644
index 0000000000..95d5581c4e
--- /dev/null
+++ b/assets/world/tree/pine_blue/3.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e09d1d5ceb9583dc5dc7e9ae7f1aea8bad7e36b5bcba15e00f4464adfcdecd72
+size 56140
diff --git a/assets/world/tree/pine_blue/4.vox b/assets/world/tree/pine_blue/4.vox
new file mode 100644
index 0000000000..6c33f82235
--- /dev/null
+++ b/assets/world/tree/pine_blue/4.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7234ddcf50a94f58fd2086ca08298b859d3846f1f87747836877b7a9f05e3a1e
+size 48309
diff --git a/assets/world/tree/pine_blue/5.vox b/assets/world/tree/pine_blue/5.vox
new file mode 100644
index 0000000000..9ccbc7b768
--- /dev/null
+++ b/assets/world/tree/pine_blue/5.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:23343587a1060a5bc60290bfdca8bb03ca0e0340421947638a23cffb5988ac9f
+size 51128
diff --git a/assets/world/tree/pine_blue/6.vox b/assets/world/tree/pine_blue/6.vox
new file mode 100644
index 0000000000..c8d78eb1ae
--- /dev/null
+++ b/assets/world/tree/pine_blue/6.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:48b1c9ea1dc2d451315693d7168deacdddf3e24d1a960dc3e5118848727dcc97
+size 49053
diff --git a/assets/world/tree/pine_blue/7.vox b/assets/world/tree/pine_blue/7.vox
new file mode 100644
index 0000000000..8f1cca16da
--- /dev/null
+++ b/assets/world/tree/pine_blue/7.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2fc0d2b6a33e77ad9bee490790f433841053121a095ad23bccb09ad63c00a1c1
+size 54812
diff --git a/assets/world/tree/pine_blue/8.vox b/assets/world/tree/pine_blue/8.vox
new file mode 100644
index 0000000000..7576fa3f44
--- /dev/null
+++ b/assets/world/tree/pine_blue/8.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5455caf6a1f3d33b9e5c3c8168629f6ad847a99f62a952e566918ab29d617d78
+size 50265
diff --git a/assets/world/tree/pine_green/1.vox b/assets/world/tree/pine_green/1.vox
new file mode 100644
index 0000000000..071218cb68
--- /dev/null
+++ b/assets/world/tree/pine_green/1.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b227240a70f3651fd69dcf36e2563d53715c1fcef0c5213f6293e3f833cb4a01
+size 50576
diff --git a/assets/world/tree/pine_green/2.vox b/assets/world/tree/pine_green/2.vox
new file mode 100644
index 0000000000..ac3ee6e430
--- /dev/null
+++ b/assets/world/tree/pine_green/2.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e2b3fa327246cd31b383d64a1270136f4bd62d37da0d933acad8ef95a9a2a8f5
+size 54148
diff --git a/assets/world/tree/temperate_pine_green/3.vox b/assets/world/tree/pine_green/3.vox
similarity index 100%
rename from assets/world/tree/temperate_pine_green/3.vox
rename to assets/world/tree/pine_green/3.vox
diff --git a/assets/world/tree/pine_green/4.vox b/assets/world/tree/pine_green/4.vox
new file mode 100644
index 0000000000..19de068641
--- /dev/null
+++ b/assets/world/tree/pine_green/4.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c99570187b18f4f06a3c7fef2b9a2d3578aa71747f8518b0b6710f70e9d373e7
+size 48309
diff --git a/assets/world/tree/pine_green/5.vox b/assets/world/tree/pine_green/5.vox
new file mode 100644
index 0000000000..ee2a6b7cd1
--- /dev/null
+++ b/assets/world/tree/pine_green/5.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5e77fe0932151bcf644b6e32e87da948d810d2511ff15a181d61da991457f834
+size 51128
diff --git a/assets/world/tree/pine_green/6.vox b/assets/world/tree/pine_green/6.vox
new file mode 100644
index 0000000000..d005f4575e
--- /dev/null
+++ b/assets/world/tree/pine_green/6.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a828dd0f77376544424876516df8f909434b0cec04e36ed8ff27de720a2f18f2
+size 49053
diff --git a/assets/world/tree/pine_green/7.vox b/assets/world/tree/pine_green/7.vox
new file mode 100644
index 0000000000..3ef50ffeaf
--- /dev/null
+++ b/assets/world/tree/pine_green/7.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3158ad1e2e37a9900b0bf46a950f0fa2d885a294109a7bba2881435442a6f055
+size 54812
diff --git a/assets/world/tree/temperate_pine_green/8.vox b/assets/world/tree/pine_green/8.vox
similarity index 100%
rename from assets/world/tree/temperate_pine_green/8.vox
rename to assets/world/tree/pine_green/8.vox
diff --git a/assets/world/tree/temperate_pine_green_2/10.vox b/assets/world/tree/pine_green_2/10.vox
similarity index 100%
rename from assets/world/tree/temperate_pine_green_2/10.vox
rename to assets/world/tree/pine_green_2/10.vox
diff --git a/assets/world/tree/temperate_pine_green_2/3.vox b/assets/world/tree/pine_green_2/3.vox
similarity index 100%
rename from assets/world/tree/temperate_pine_green_2/3.vox
rename to assets/world/tree/pine_green_2/3.vox
diff --git a/assets/world/tree/temperate_pine_green_2/4.vox b/assets/world/tree/pine_green_2/4.vox
similarity index 100%
rename from assets/world/tree/temperate_pine_green_2/4.vox
rename to assets/world/tree/pine_green_2/4.vox
diff --git a/assets/world/tree/temperate_pine_green_2/5.vox b/assets/world/tree/pine_green_2/5.vox
similarity index 100%
rename from assets/world/tree/temperate_pine_green_2/5.vox
rename to assets/world/tree/pine_green_2/5.vox
diff --git a/assets/world/tree/temperate_pine_green_2/6.vox b/assets/world/tree/pine_green_2/6.vox
similarity index 100%
rename from assets/world/tree/temperate_pine_green_2/6.vox
rename to assets/world/tree/pine_green_2/6.vox
diff --git a/assets/world/tree/temperate_pine_green_2/7.vox b/assets/world/tree/pine_green_2/7.vox
similarity index 100%
rename from assets/world/tree/temperate_pine_green_2/7.vox
rename to assets/world/tree/pine_green_2/7.vox
diff --git a/assets/world/tree/temperate_pine_green_2/8.vox b/assets/world/tree/pine_green_2/8.vox
similarity index 100%
rename from assets/world/tree/temperate_pine_green_2/8.vox
rename to assets/world/tree/pine_green_2/8.vox
diff --git a/assets/world/tree/temperate_pine_green_2/9.vox b/assets/world/tree/pine_green_2/9.vox
similarity index 100%
rename from assets/world/tree/temperate_pine_green_2/9.vox
rename to assets/world/tree/pine_green_2/9.vox
diff --git a/assets/world/tree/poplar/1.vox b/assets/world/tree/poplar/1.vox
new file mode 100644
index 0000000000..9ffa73d2f9
--- /dev/null
+++ b/assets/world/tree/poplar/1.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:31336ecc042cbf30586e275d5fd0444ab966701b540b7a408ea4558b77d097ab
+size 62715
diff --git a/assets/world/tree/poplar/10.vox b/assets/world/tree/poplar/10.vox
new file mode 100644
index 0000000000..f8b8e1cb44
--- /dev/null
+++ b/assets/world/tree/poplar/10.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c1d4a6aaccf75c1bdf050252430ee306d0d07899b9fbbcbd33e4bf6dfdce0cd8
+size 66627
diff --git a/assets/world/tree/poplar/2.vox b/assets/world/tree/poplar/2.vox
new file mode 100644
index 0000000000..3f732a9cfb
--- /dev/null
+++ b/assets/world/tree/poplar/2.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b4370e51fab02eca30f388a3d3c153a76fa7d55c1f43b6b113b8134ec3e6cd20
+size 60703
diff --git a/assets/world/tree/poplar/3.vox b/assets/world/tree/poplar/3.vox
new file mode 100644
index 0000000000..52f4c51f6b
--- /dev/null
+++ b/assets/world/tree/poplar/3.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eafd980957ef0c6f8c799a6f3b7092e3a0ea06e0a5e908558198d4ea2eb81c06
+size 55959
diff --git a/assets/world/tree/poplar/4.vox b/assets/world/tree/poplar/4.vox
new file mode 100644
index 0000000000..200d851fb6
--- /dev/null
+++ b/assets/world/tree/poplar/4.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f27d7b17ba6a39f6b6a84894c3de0497aa780caa6b1a9ab75c7fad7ab415723c
+size 54335
diff --git a/assets/world/tree/poplar/5.vox b/assets/world/tree/poplar/5.vox
new file mode 100644
index 0000000000..3627fd776f
--- /dev/null
+++ b/assets/world/tree/poplar/5.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7a3f2d711c1b23105760e5155b9ef314be98434bff2fc9ea366516688e52979f
+size 58739
diff --git a/assets/world/tree/poplar/6.vox b/assets/world/tree/poplar/6.vox
new file mode 100644
index 0000000000..e22390dbc4
--- /dev/null
+++ b/assets/world/tree/poplar/6.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c658da443017af01959e2ac493464447526025b8e7ff1ddf8c92e24ab1576ca4
+size 52687
diff --git a/assets/world/tree/poplar/7.vox b/assets/world/tree/poplar/7.vox
new file mode 100644
index 0000000000..b197f0a8fb
--- /dev/null
+++ b/assets/world/tree/poplar/7.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0290abebb760ab313ebd5a1516a567620fff002ac98216144cbf37fc3b54c02c
+size 55403
diff --git a/assets/world/tree/poplar/8.vox b/assets/world/tree/poplar/8.vox
new file mode 100644
index 0000000000..63f5d6203f
--- /dev/null
+++ b/assets/world/tree/poplar/8.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:da0f3771649471d5348f76d6385ea8a24e59367c2b6fe2f968da434e2ce57ecb
+size 59095
diff --git a/assets/world/tree/poplar/9.vox b/assets/world/tree/poplar/9.vox
new file mode 100644
index 0000000000..bd4025e0c1
--- /dev/null
+++ b/assets/world/tree/poplar/9.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f77c417ef2416b80036d742298b2b165edd3c11c395da826c2dc76d6beb3f140
+size 58387
diff --git a/assets/world/tree/snow_pine/1.vox b/assets/world/tree/snow_pine/1.vox
new file mode 100644
index 0000000000..1f4e40a851
--- /dev/null
+++ b/assets/world/tree/snow_pine/1.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4a57cb6886927031b01b8ddbb5107d4e41acff343b63d1f52dc0da35cd6e2f15
+size 54468
diff --git a/assets/world/tree/snow_pine/10.vox b/assets/world/tree/snow_pine/10.vox
deleted file mode 100644
index f1a1988078..0000000000
--- a/assets/world/tree/snow_pine/10.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:027cdd3b0bc0a71543b9716c7a214969484897236cda1c0dc7638291ed65f34f
-size 52937
diff --git a/assets/world/tree/snow_pine/2.vox b/assets/world/tree/snow_pine/2.vox
new file mode 100644
index 0000000000..2f52465cfa
--- /dev/null
+++ b/assets/world/tree/snow_pine/2.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0c41b3a40a5d1cd3b6c28ed1603a83dce549e30d70697af1b2bc50d82c263e12
+size 60716
diff --git a/assets/world/tree/snow_pine/3.vox b/assets/world/tree/snow_pine/3.vox
index 1f4e40a851..eeccc5e5f8 100644
--- a/assets/world/tree/snow_pine/3.vox
+++ b/assets/world/tree/snow_pine/3.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4a57cb6886927031b01b8ddbb5107d4e41acff343b63d1f52dc0da35cd6e2f15
-size 54468
+oid sha256:14b02582699a11f2e26dc153fec7c95d4924ba06f8ebd3a74de0c58887a4804f
+size 64096
diff --git a/assets/world/tree/snow_pine/4.vox b/assets/world/tree/snow_pine/4.vox
index 2f52465cfa..ef1b876aeb 100644
--- a/assets/world/tree/snow_pine/4.vox
+++ b/assets/world/tree/snow_pine/4.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0c41b3a40a5d1cd3b6c28ed1603a83dce549e30d70697af1b2bc50d82c263e12
-size 60716
+oid sha256:a2b83a8f72204a194d019362beea486bcafefd1947ec0f2864edabd0cd607e0b
+size 50181
diff --git a/assets/world/tree/snow_pine/5.vox b/assets/world/tree/snow_pine/5.vox
index eeccc5e5f8..c84bffb00d 100644
--- a/assets/world/tree/snow_pine/5.vox
+++ b/assets/world/tree/snow_pine/5.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:14b02582699a11f2e26dc153fec7c95d4924ba06f8ebd3a74de0c58887a4804f
-size 64096
+oid sha256:81c09d3d1dddda2420a0efc001a0a4327fcd394d71df728a240ad00308ac8c40
+size 53928
diff --git a/assets/world/tree/snow_pine/6.vox b/assets/world/tree/snow_pine/6.vox
index ef1b876aeb..40709a7328 100644
--- a/assets/world/tree/snow_pine/6.vox
+++ b/assets/world/tree/snow_pine/6.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a2b83a8f72204a194d019362beea486bcafefd1947ec0f2864edabd0cd607e0b
-size 50181
+oid sha256:10cc5b12ac9af042830f43d890ab305ac1ceb6a90d1a6cf25907ab0f7136a4be
+size 50893
diff --git a/assets/world/tree/snow_pine/7.vox b/assets/world/tree/snow_pine/7.vox
index c84bffb00d..8cd6f87a25 100644
--- a/assets/world/tree/snow_pine/7.vox
+++ b/assets/world/tree/snow_pine/7.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:81c09d3d1dddda2420a0efc001a0a4327fcd394d71df728a240ad00308ac8c40
-size 53928
+oid sha256:e24ad0cc8a872cef61b98c174be979bd33e3e06f693bdeacc15ffb56782f7ff1
+size 58956
diff --git a/assets/world/tree/snow_pine/8.vox b/assets/world/tree/snow_pine/8.vox
index 40709a7328..f1a1988078 100644
--- a/assets/world/tree/snow_pine/8.vox
+++ b/assets/world/tree/snow_pine/8.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:10cc5b12ac9af042830f43d890ab305ac1ceb6a90d1a6cf25907ab0f7136a4be
-size 50893
+oid sha256:027cdd3b0bc0a71543b9716c7a214969484897236cda1c0dc7638291ed65f34f
+size 52937
diff --git a/assets/world/tree/snow_pine/9.vox b/assets/world/tree/snow_pine/9.vox
deleted file mode 100644
index 8cd6f87a25..0000000000
--- a/assets/world/tree/snow_pine/9.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e24ad0cc8a872cef61b98c174be979bd33e3e06f693bdeacc15ffb56782f7ff1
-size 58956
diff --git a/assets/world/tree/temperate_birch/2.vox b/assets/world/tree/temperate_birch/2.vox
deleted file mode 100644
index 503d6132dd..0000000000
--- a/assets/world/tree/temperate_birch/2.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:027613fa1357e750c745872f1ce1814a2b5baf0dac8ac68702cad11f024ba046
-size 52160
diff --git a/assets/world/tree/temperate_pine_blue/10.vox b/assets/world/tree/temperate_pine_blue/10.vox
deleted file mode 100644
index 8e23e70132..0000000000
--- a/assets/world/tree/temperate_pine_blue/10.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:53f38bbfd33c231c83656e4c2e9c154915b8a83fa84a592425ac3a4b5b618bc4
-size 50265
diff --git a/assets/world/tree/temperate_pine_blue/3.vox b/assets/world/tree/temperate_pine_blue/3.vox
deleted file mode 100644
index 47e53ed0d0..0000000000
--- a/assets/world/tree/temperate_pine_blue/3.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d11030f9851857a04db7eb5cad510d4e4320ee8bbc4988e153976c912e029e55
-size 50576
diff --git a/assets/world/tree/temperate_pine_blue/4.vox b/assets/world/tree/temperate_pine_blue/4.vox
deleted file mode 100644
index d3c63fb0aa..0000000000
--- a/assets/world/tree/temperate_pine_blue/4.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ff233202c00666449f8d09e48ef2c09fd5946efa56c47a2a44c6c4335ce52f85
-size 54148
diff --git a/assets/world/tree/temperate_pine_blue/5.vox b/assets/world/tree/temperate_pine_blue/5.vox
deleted file mode 100644
index 39d5df14a8..0000000000
--- a/assets/world/tree/temperate_pine_blue/5.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b9614b195284865710f5edb939dcdce666925fb7982c51ceddf930b06dbfbcb9
-size 56140
diff --git a/assets/world/tree/temperate_pine_blue/6.vox b/assets/world/tree/temperate_pine_blue/6.vox
deleted file mode 100644
index a9c3c90418..0000000000
--- a/assets/world/tree/temperate_pine_blue/6.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fc7e79fc22f2a312dfae5e46e9a517c5d51980e16710a4ee46e49c0e7211bf97
-size 48309
diff --git a/assets/world/tree/temperate_pine_blue/7.vox b/assets/world/tree/temperate_pine_blue/7.vox
deleted file mode 100644
index 1b5182ca0c..0000000000
--- a/assets/world/tree/temperate_pine_blue/7.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5c5a1bc48ddd0748fcef353956d19dd09022e4d09bc0ac4b21d62e43ee197953
-size 51128
diff --git a/assets/world/tree/temperate_pine_blue/8.vox b/assets/world/tree/temperate_pine_blue/8.vox
deleted file mode 100644
index f18f928734..0000000000
--- a/assets/world/tree/temperate_pine_blue/8.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a2c6fd4d7e9b05840fcf8bc0cceb909431552629e4df3cbc367416b5375eb477
-size 49053
diff --git a/assets/world/tree/temperate_pine_blue/9.vox b/assets/world/tree/temperate_pine_blue/9.vox
deleted file mode 100644
index 5e134cab96..0000000000
--- a/assets/world/tree/temperate_pine_blue/9.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:06f9af568c0d27728ccbd02f631dee7cba67f69028ffd2b1968cf69aa3353b6d
-size 54812
diff --git a/assets/world/tree/temperate_pine_green/1.vox b/assets/world/tree/temperate_pine_green/1.vox
deleted file mode 100644
index 58193ecf49..0000000000
--- a/assets/world/tree/temperate_pine_green/1.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:15648b85f70c1d1455490a7842b3c4b0c984c1d1b16b83ab047305fb3760ecfb
-size 50630
diff --git a/assets/world/tree/temperate_pine_green/2.vox b/assets/world/tree/temperate_pine_green/2.vox
deleted file mode 100644
index ecd2c744ed..0000000000
--- a/assets/world/tree/temperate_pine_green/2.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:59759c3514ee0b801b8ca1c9924b3a81a183d621e8af95eabf93942d1802c728
-size 54202
diff --git a/assets/world/tree/temperate_pine_green/4.vox b/assets/world/tree/temperate_pine_green/4.vox
deleted file mode 100644
index 436a2b92e9..0000000000
--- a/assets/world/tree/temperate_pine_green/4.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1f156028744d592ca266d258453be1e0865b9f23c0168001c3537bbc66306831
-size 48363
diff --git a/assets/world/tree/temperate_pine_green/5.vox b/assets/world/tree/temperate_pine_green/5.vox
deleted file mode 100644
index 5874596b30..0000000000
--- a/assets/world/tree/temperate_pine_green/5.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a56beaef199790a8de33ecc8445de5c0ccb43577d600efd40f433af856d471b3
-size 51182
diff --git a/assets/world/tree/temperate_pine_green/6.vox b/assets/world/tree/temperate_pine_green/6.vox
deleted file mode 100644
index 865d1b4eae..0000000000
--- a/assets/world/tree/temperate_pine_green/6.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:85ce72b11ca71fb70e46dbc0d5c99a09bdfef30db838d47422299d68d73d29b6
-size 49107
diff --git a/assets/world/tree/temperate_pine_green/7.vox b/assets/world/tree/temperate_pine_green/7.vox
deleted file mode 100644
index 9a7ac6fc2a..0000000000
--- a/assets/world/tree/temperate_pine_green/7.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7cb5d99bf1750729923e620a43ac34b4bd823385b0dea5fc9fe66c07ba9175fe
-size 54866
diff --git a/world/src/sim.rs b/world/src/sim.rs
index db3adb75da..2cae6bc3f6 100644
--- a/world/src/sim.rs
+++ b/world/src/sim.rs
@@ -333,59 +333,84 @@ impl<'a> Sampler<'a> {
 }
 
 lazy_static! {
-    static ref TREES: [Arc<Structure>; 23] = [
+    static ref TREES: [Arc<Structure>; 53] = [
         // green oaks
-        assets::load_map("world/tree/temperate_oak_green/1.vox", |s: Structure| s
+        assets::load_map("world/tree/oak_green/1.vox", |s: Structure| s
             .with_center(Vec3::new(15, 18, 14)))
         .unwrap(),
-        assets::load_map("world/tree/temperate_oak_green/2.vox", |s: Structure| s
+        assets::load_map("world/tree/oak_green/2.vox", |s: Structure| s
             .with_center(Vec3::new(15, 18, 14)))
         .unwrap(),
-        assets::load_map("world/tree/temperate_oak_green/3.vox", |s: Structure| s
-            .with_center(Vec3::new(15, 18, 14)))
+        assets::load_map("world/tree/oak_green/3.vox", |s: Structure| s
+            .with_center(Vec3::new(16, 20, 14)))
         .unwrap(),
-        assets::load_map("world/tree/temperate_oak_green/4.vox", |s: Structure| s
-            .with_center(Vec3::new(15, 18, 14)))
+        assets::load_map("world/tree/oak_green/4.vox", |s: Structure| s
+            .with_center(Vec3::new(18, 21, 14)))
         .unwrap(),
-        assets::load_map("world/tree/temperate_oak_green/5.vox", |s: Structure| s
-            .with_center(Vec3::new(15, 18, 14)))
+        assets::load_map("world/tree/oak_green/5.vox", |s: Structure| s
+            .with_center(Vec3::new(18, 18, 14)))
         .unwrap(),
-        assets::load_map("world/tree/temperate_oak_green/6.vox", |s: Structure| s
-            .with_center(Vec3::new(15, 18, 14)))
+        assets::load_map("world/tree/oak_green/6.vox", |s: Structure| s
+            .with_center(Vec3::new(16, 21, 14)))
         .unwrap(),
-        assets::load_map("world/tree/temperate_oak_green/7.vox", |s: Structure| s
-            .with_center(Vec3::new(15, 18, 14)))
+        assets::load_map("world/tree/oak_green/7.vox", |s: Structure| s
+            .with_center(Vec3::new(20, 19, 14)))
         .unwrap(),
-        assets::load_map("world/tree/temperate_oak_green/8.vox", |s: Structure| s
-            .with_center(Vec3::new(15, 18, 14)))
+        assets::load_map("world/tree/oak_green/8.vox", |s: Structure| s
+            .with_center(Vec3::new(22, 20, 14)))
         .unwrap(),
-        assets::load_map("world/tree/temperate_oak_green/9.vox", |s: Structure| s
-            .with_center(Vec3::new(15, 18, 14)))
+        assets::load_map("world/tree/oak_green/9.vox", |s: Structure| s
+            .with_center(Vec3::new(26, 26, 14)))
         .unwrap(),
         // green pines
-        assets::load_map("world/tree/temperate_pine_green/1.vox", |s: Structure| s
+        assets::load_map("world/tree/pine_green/1.vox", |s: Structure| s
             .with_center(Vec3::new(15, 15, 14)))
         .unwrap(),
-        assets::load_map("world/tree/temperate_pine_green/2.vox", |s: Structure| s
+        assets::load_map("world/tree/pine_green/2.vox", |s: Structure| s
             .with_center(Vec3::new(15, 15, 14)))
         .unwrap(),
-        assets::load_map("world/tree/temperate_pine_green/3.vox", |s: Structure| s
-            .with_center(Vec3::new(15, 15, 12)))
+        assets::load_map("world/tree/pine_green/3.vox", |s: Structure| s
+            .with_center(Vec3::new(17, 15, 12)))
         .unwrap(),
-        assets::load_map("world/tree/temperate_pine_green/4.vox", |s: Structure| s
-            .with_center(Vec3::new(15, 15, 12)))
+        assets::load_map("world/tree/pine_green/4.vox", |s: Structure| s
+            .with_center(Vec3::new(10, 8, 12)))
         .unwrap(),
-        assets::load_map("world/tree/temperate_pine_green/5.vox", |s: Structure| s
-            .with_center(Vec3::new(15, 15, 12)))
+        assets::load_map("world/tree/pine_green/5.vox", |s: Structure| s
+            .with_center(Vec3::new(12, 12, 12)))
         .unwrap(),
-        assets::load_map("world/tree/temperate_pine_green/6.vox", |s: Structure| s
-            .with_center(Vec3::new(15, 15, 12)))
+        assets::load_map("world/tree/pine_green/6.vox", |s: Structure| s
+            .with_center(Vec3::new(11, 10, 12)))
         .unwrap(),
-        assets::load_map("world/tree/temperate_pine_green/7.vox", |s: Structure| s
-            .with_center(Vec3::new(15, 15, 12)))
+        assets::load_map("world/tree/pine_green/7.vox", |s: Structure| s
+            .with_center(Vec3::new(16, 15, 12)))
         .unwrap(),
-        assets::load_map("world/tree/temperate_pine_green/8.vox", |s: Structure| s
-            .with_center(Vec3::new(15, 15, 12)))
+        assets::load_map("world/tree/pine_green/8.vox", |s: Structure| s
+            .with_center(Vec3::new(12, 10, 12)))
+        .unwrap(),
+        // blue pines
+        assets::load_map("world/tree/pine_blue/1.vox", |s: Structure| s
+            .with_center(Vec3::new(15, 15, 14)))
+        .unwrap(),
+        assets::load_map("world/tree/pine_blue/2.vox", |s: Structure| s
+            .with_center(Vec3::new(15, 15, 14)))
+        .unwrap(),
+        assets::load_map("world/tree/pine_blue/3.vox", |s: Structure| s
+            .with_center(Vec3::new(17, 15, 12)))
+        .unwrap(),
+        assets::load_map("world/tree/pine_blue/4.vox", |s: Structure| s
+            .with_center(Vec3::new(10, 8, 12)))
+        .unwrap(),
+        assets::load_map("world/tree/pine_blue/5.vox", |s: Structure| s
+            .with_center(Vec3::new(12, 12, 12)))
+        .unwrap(),
+        assets::load_map("world/tree/pine_blue/6.vox", |s: Structure| s
+            .with_center(Vec3::new(11, 10, 12)))
+        .unwrap(),
+        assets::load_map("world/tree/pine_blue/7.vox", |s: Structure| s
+            .with_center(Vec3::new(16, 15, 12)))
+        .unwrap(),
+        assets::load_map("world/tree/pine_blue/8.vox", |s: Structure| s
+            .with_center(Vec3::new(12, 10, 12)))
         .unwrap(),
         // temperate small
         assets::load_map("world/tree/temperate_small/1.vox", |s: Structure| s
@@ -406,6 +431,74 @@ lazy_static! {
         assets::load_map("world/tree/temperate_small/6.vox", |s: Structure| s
             .with_center(Vec3::new(4, 4, 7)))
         .unwrap(),
+        // birch
+        assets::load_map("world/tree/birch/1.vox", |s: Structure| s
+            .with_center(Vec3::new(12, 9, 2)))
+        .unwrap(),
+        assets::load_map("world/tree/birch/2.vox", |s: Structure| s
+            .with_center(Vec3::new(11, 10, 2)))
+        .unwrap(),
+        assets::load_map("world/tree/birch/3.vox", |s: Structure| s
+            .with_center(Vec3::new(9, 10, 2)))
+        .unwrap(),
+        assets::load_map("world/tree/birch/4.vox", |s: Structure| s
+            .with_center(Vec3::new(9, 10, 2)))
+        .unwrap(),
+        assets::load_map("world/tree/birch/5.vox", |s: Structure| s
+            .with_center(Vec3::new(9, 11, 2)))
+        .unwrap(),
+        assets::load_map("world/tree/birch/6.vox", |s: Structure| s
+            .with_center(Vec3::new(9, 9, 2)))
+        .unwrap(),
+        assets::load_map("world/tree/birch/7.vox", |s: Structure| s
+            .with_center(Vec3::new(10, 10, 2)))
+        .unwrap(),
+        assets::load_map("world/tree/birch/8.vox", |s: Structure| s
+            .with_center(Vec3::new(9, 9, 2)))
+        .unwrap(),
+        assets::load_map("world/tree/birch/9.vox", |s: Structure| s
+            .with_center(Vec3::new(9, 10, 2)))
+        .unwrap(),
+        assets::load_map("world/tree/birch/10.vox", |s: Structure| s
+            .with_center(Vec3::new(10, 9, 2)))
+        .unwrap(),
+        assets::load_map("world/tree/birch/11.vox", |s: Structure| s
+            .with_center(Vec3::new(9, 10, 2)))
+        .unwrap(),
+        assets::load_map("world/tree/birch/12.vox", |s: Structure| s
+            .with_center(Vec3::new(10, 9, 2)))
+        .unwrap(),
+        // poplar
+        assets::load_map("world/tree/poplar/1.vox", |s: Structure| s
+            .with_center(Vec3::new(6, 6, 2)))
+        .unwrap(),
+        assets::load_map("world/tree/poplar/2.vox", |s: Structure| s
+            .with_center(Vec3::new(6, 6, 2)))
+        .unwrap(),
+        assets::load_map("world/tree/poplar/3.vox", |s: Structure| s
+            .with_center(Vec3::new(6, 6, 2)))
+        .unwrap(),
+        assets::load_map("world/tree/poplar/4.vox", |s: Structure| s
+            .with_center(Vec3::new(6, 6, 2)))
+        .unwrap(),
+        assets::load_map("world/tree/poplar/5.vox", |s: Structure| s
+            .with_center(Vec3::new(6, 6, 2)))
+        .unwrap(),
+        assets::load_map("world/tree/poplar/6.vox", |s: Structure| s
+            .with_center(Vec3::new(6, 6, 2)))
+        .unwrap(),
+        assets::load_map("world/tree/poplar/7.vox", |s: Structure| s
+            .with_center(Vec3::new(6, 6, 2)))
+        .unwrap(),
+        assets::load_map("world/tree/poplar/8.vox", |s: Structure| s
+            .with_center(Vec3::new(6, 6, 2)))
+        .unwrap(),
+        assets::load_map("world/tree/poplar/9.vox", |s: Structure| s
+            .with_center(Vec3::new(6, 6, 2)))
+        .unwrap(),
+        assets::load_map("world/tree/poplar/10.vox", |s: Structure| s
+            .with_center(Vec3::new(7, 7, 2)))
+        .unwrap(),
     ];
 }
 
@@ -425,7 +518,7 @@ pub struct Sample3d {
     pub block: Block,
 }
 
-const Z_TOLERANCE: (f32, f32) = (96.0, 64.0);
+const Z_TOLERANCE: (f32, f32) = (126.0, 94.0);
 pub const SEA_LEVEL: f32 = 128.0;
 
 pub struct SimChunk {