diff --git a/.cargo/config b/.cargo/config
index 5dbe6321db..87d684cbbf 100644
--- a/.cargo/config
+++ b/.cargo/config
@@ -31,4 +31,4 @@ dbg-voxygen = "run --bin veloren-voxygen --profile debuginfo"
 # misc
 swarm = "run --bin swarm --features client/bin_bot,client/tick_network --"
 ci-clippy = "clippy --all-targets --locked --features=bin_cmd_doc_gen,bin_compression,bin_csv,bin_graphviz,bin_bot,bin_asset_migrate,asset_tweak,bin,stat"
-ci-clippy2 = "clippy -p veloren-voxygen --locked --no-default-features --features=default-publish"
\ No newline at end of file
+ci-clippy2 = "clippy -p veloren-voxygen --locked --no-default-features --features=default-publish"
diff --git a/assets/voxygen/voxel/sprite/cave/cave_flower-0.vox b/assets/voxygen/voxel/sprite/cave/cave_flower-0.vox
new file mode 100644
index 0000000000..bb6e51aa78
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/cave/cave_flower-0.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:21ff5a60c0de91a802974a2d108f75aaf867ae131cf6f0fb83d7fbbff1a6f26b
+size 1692
diff --git a/assets/voxygen/voxel/sprite/cave/cave_flower-1.vox b/assets/voxygen/voxel/sprite/cave/cave_flower-1.vox
new file mode 100644
index 0000000000..3c81954969
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/cave/cave_flower-1.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3b02a74066dba97ed9fc0be8f41a4dbfea8789d89cf7bb66b69fccb9b138266f
+size 1692
diff --git a/assets/voxygen/voxel/sprite/cave/cave_flower-2.vox b/assets/voxygen/voxel/sprite/cave/cave_flower-2.vox
new file mode 100644
index 0000000000..8a6b8371c8
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/cave/cave_flower-2.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cbb1de9a0121e651eddaf1173e399d0b935987e6369184b7db4a132f45999b06
+size 1476
diff --git a/assets/voxygen/voxel/sprite/cave/cave_flower-3.vox b/assets/voxygen/voxel/sprite/cave/cave_flower-3.vox
new file mode 100644
index 0000000000..825e09453d
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/cave/cave_flower-3.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e39792dd2ae936dc3b77bd97d11432cd2754bcc405d7437f5ce517ab0914240c
+size 1468
diff --git a/assets/voxygen/voxel/sprite/cave/cave_lantern_flower-0.vox b/assets/voxygen/voxel/sprite/cave/cave_lantern_flower-0.vox
new file mode 100644
index 0000000000..77b0341276
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/cave/cave_lantern_flower-0.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8a6d8454c26ac51af3b5ad1ab32b3f5dbe1793b116214fe2d62b2fe6d4602be5
+size 2616
diff --git a/assets/voxygen/voxel/sprite/cave/cave_lantern_flower-1.vox b/assets/voxygen/voxel/sprite/cave/cave_lantern_flower-1.vox
new file mode 100644
index 0000000000..104f6d401e
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/cave/cave_lantern_flower-1.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:08dcd4e0d3675f13584d6be67e567c021ac8284406d5f136a70b145c7f5e6724
+size 4092
diff --git a/assets/voxygen/voxel/sprite/cave/cave_lantern_flower-2.vox b/assets/voxygen/voxel/sprite/cave/cave_lantern_flower-2.vox
new file mode 100644
index 0000000000..8dd74a6124
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/cave/cave_lantern_flower-2.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:059048f6a2fc9873817b7990baddaadd5ea5f4af522ab484657238d359798a98
+size 2080
diff --git a/assets/voxygen/voxel/sprite/cave/cave_lantern_plant-0.vox b/assets/voxygen/voxel/sprite/cave/cave_lantern_plant-0.vox
new file mode 100644
index 0000000000..4240d8f408
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/cave/cave_lantern_plant-0.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:85e6a614536b62f034adc3fa05f28fbe4b2d41a111fd8947f373017a40d1bf4f
+size 2212
diff --git a/assets/voxygen/voxel/sprite/cave/cave_lantern_plant-1.vox b/assets/voxygen/voxel/sprite/cave/cave_lantern_plant-1.vox
new file mode 100644
index 0000000000..0512c9f088
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/cave/cave_lantern_plant-1.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9ce0a40c247311e02f0f3c547fd0d3c0d6d0b6a502500e0d9fec67ed483779ce
+size 2116
diff --git a/assets/voxygen/voxel/sprite/cave/cave_lantern_plant-2.vox b/assets/voxygen/voxel/sprite/cave/cave_lantern_plant-2.vox
new file mode 100644
index 0000000000..eef86a3165
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/cave/cave_lantern_plant-2.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:99db3fadfaa5f7a6202225aa543a8a35ee1a9fd5514828af7549daff49880cfa
+size 1932
diff --git a/assets/voxygen/voxel/sprite/cave/ceiling/cave_lantern_flower-0.vox b/assets/voxygen/voxel/sprite/cave/ceiling/cave_lantern_flower-0.vox
new file mode 100644
index 0000000000..2706aaa80e
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/cave/ceiling/cave_lantern_flower-0.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:67e2193410f9cc0687e4ee62b9fdd02cdfdc41c6c21e7fa22fa0fe083434d0e4
+size 2616
diff --git a/assets/voxygen/voxel/sprite/cave/ceiling/cave_lantern_flower-1.vox b/assets/voxygen/voxel/sprite/cave/ceiling/cave_lantern_flower-1.vox
new file mode 100644
index 0000000000..7b72b2e4eb
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/cave/ceiling/cave_lantern_flower-1.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a904f1945610b0f69717acc9ad0f44a8aa315caad3d732b185901328846537e2
+size 4092
diff --git a/assets/voxygen/voxel/sprite/cave/ceiling/cave_lantern_flower-2.vox b/assets/voxygen/voxel/sprite/cave/ceiling/cave_lantern_flower-2.vox
new file mode 100644
index 0000000000..4e3bf99edb
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/cave/ceiling/cave_lantern_flower-2.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3f5228452cc894fb375708ca34c2d06ff13be205eae352880a69428a32271e6b
+size 2080
diff --git a/assets/voxygen/voxel/sprite/cave/ceiling/cave_lantern_plant-0.vox b/assets/voxygen/voxel/sprite/cave/ceiling/cave_lantern_plant-0.vox
new file mode 100644
index 0000000000..e36bcfef97
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/cave/ceiling/cave_lantern_plant-0.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2a2c8cc9cde6ac6605dc99140a25d71bf7b0f3e9c2922c2d14aaa7f851d64e7d
+size 1932
diff --git a/assets/voxygen/voxel/sprite/cave/ceiling/cave_lantern_plant-1.vox b/assets/voxygen/voxel/sprite/cave/ceiling/cave_lantern_plant-1.vox
new file mode 100644
index 0000000000..56c319971a
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/cave/ceiling/cave_lantern_plant-1.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c6192326c37ca9e3faac1130a10e0206506af0e21faf4c3d2ca2c68e9b8977d4
+size 1884
diff --git a/assets/voxygen/voxel/sprite/cave/ceiling/mold-4.vox b/assets/voxygen/voxel/sprite/cave/ceiling/mold-4.vox
index 3e27f7226e..759db915e7 100644
--- a/assets/voxygen/voxel/sprite/cave/ceiling/mold-4.vox
+++ b/assets/voxygen/voxel/sprite/cave/ceiling/mold-4.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:80117ff139a0b28ddc8b00e26f3005abe25444abd8e61fe2179941d2dd060abe
-size 2140
+oid sha256:ff62aa84976fe527082c55088a5230e9f401a557c3e99d54e41cead27a6b6f2b
+size 1880
diff --git a/assets/voxygen/voxel/sprite/cave/ceiling/mold-5.vox b/assets/voxygen/voxel/sprite/cave/ceiling/mold-5.vox
index bd1f28ddf7..b8360b1aee 100644
--- a/assets/voxygen/voxel/sprite/cave/ceiling/mold-5.vox
+++ b/assets/voxygen/voxel/sprite/cave/ceiling/mold-5.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:549d7ddb44c1a935fb72e9cdc089b381d8420b7e8635fe95d5dacc05f47d27e4
-size 2792
+oid sha256:60f1aa88e010a545c6aaa59da852b4bc9cbba3f66d9c0434a8691a166a620b22
+size 2244
diff --git a/assets/voxygen/voxel/sprite/cave/ceiling/mold-6.vox b/assets/voxygen/voxel/sprite/cave/ceiling/mold-6.vox
index 8bab3a127b..f536bdd9db 100644
--- a/assets/voxygen/voxel/sprite/cave/ceiling/mold-6.vox
+++ b/assets/voxygen/voxel/sprite/cave/ceiling/mold-6.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:174071a1a2492ec08915df237cf6e02abe3f298485f772441133792d5ab49732
-size 2784
+oid sha256:c4e2e834176cd258169f499cb1a7b6046aa6fa3741e02ae16b04c8ab748d969d
+size 2340
diff --git a/assets/voxygen/voxel/sprite/cave/ceiling/mycel-0.vox b/assets/voxygen/voxel/sprite/cave/ceiling/mycel-0.vox
new file mode 100644
index 0000000000..dd3469a4b3
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/cave/ceiling/mycel-0.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fed02ca946f0a3fc4113b10f940f160a84dcf852f2d0550c10b07138ef53f701
+size 1400
diff --git a/assets/voxygen/voxel/sprite/cave/ceiling/mycel-1.vox b/assets/voxygen/voxel/sprite/cave/ceiling/mycel-1.vox
new file mode 100644
index 0000000000..194be26809
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/cave/ceiling/mycel-1.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6f38e1f4330ce5cf35d6d56ec118953bf266e5c9e9b98183a768e2639f591054
+size 1592
diff --git a/assets/voxygen/voxel/sprite/cave/ceiling/mycel-2.vox b/assets/voxygen/voxel/sprite/cave/ceiling/mycel-2.vox
new file mode 100644
index 0000000000..68f19ac0fc
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/cave/ceiling/mycel-2.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:75862c5f9c5833683ea608e167315020b9cdae1793dfc01b2f713e2cdaabd322
+size 1476
diff --git a/assets/voxygen/voxel/sprite/cave/ceiling/mycel-3.vox b/assets/voxygen/voxel/sprite/cave/ceiling/mycel-3.vox
new file mode 100644
index 0000000000..9c19329bba
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/cave/ceiling/mycel-3.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dc720540b281bc1e87ed506099b39a9c47b9ee2ea6d5df555135282eddaf090c
+size 1652
diff --git a/assets/voxygen/voxel/sprite/cave/ceiling/root-0.vox b/assets/voxygen/voxel/sprite/cave/ceiling/root-0.vox
new file mode 100644
index 0000000000..a233547634
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/cave/ceiling/root-0.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7d499ec70026859f713267c8e79d2c5998a595ddf8e8f87791ba5366a65f7c41
+size 1692
diff --git a/assets/voxygen/voxel/sprite/cave/ceiling/root-1.vox b/assets/voxygen/voxel/sprite/cave/ceiling/root-1.vox
new file mode 100644
index 0000000000..0271a5cb6a
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/cave/ceiling/root-1.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:691b155b58faaaf67abc0a13351b5496665679a38440a1d951778cacd3e67c32
+size 1864
diff --git a/assets/voxygen/voxel/sprite/cave/ceiling/root-2.vox b/assets/voxygen/voxel/sprite/cave/ceiling/root-2.vox
new file mode 100644
index 0000000000..0bbe18efea
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/cave/ceiling/root-2.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d48ae8e182d4693bf2c5a3999d95b3adabb7543c43b3f1a2a72d172ba377b7ef
+size 1792
diff --git a/assets/voxygen/voxel/sprite/cave/ceiling/root-3.vox b/assets/voxygen/voxel/sprite/cave/ceiling/root-3.vox
new file mode 100644
index 0000000000..dbdd10dcaf
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/cave/ceiling/root-3.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a5bad7db3a4b4ec642f8a1ecda4d8539d6ffd1cfc0a13887a9f1662566dbe161
+size 1712
diff --git a/assets/voxygen/voxel/sprite/cave/ceiling/root-4.vox b/assets/voxygen/voxel/sprite/cave/ceiling/root-4.vox
new file mode 100644
index 0000000000..4bc04c93ae
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/cave/ceiling/root-4.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e73fec9396657bd52e53c1a472b849a892dbf9eb2114109a215214d458129afa
+size 1632
diff --git a/assets/voxygen/voxel/sprite/cave/ceiling/root-5.vox b/assets/voxygen/voxel/sprite/cave/ceiling/root-5.vox
new file mode 100644
index 0000000000..df216ee49b
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/cave/ceiling/root-5.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bcc819c8c72db8da498cf30aa4774500ffe3d5ca1b0e83456a451752164ad6ac
+size 1604
diff --git a/assets/voxygen/voxel/sprite/cave/ceiling/root-6.vox b/assets/voxygen/voxel/sprite/cave/ceiling/root-6.vox
new file mode 100644
index 0000000000..3d6a00da78
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/cave/ceiling/root-6.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eda7ec75b5a8c52d042cf933ad2fba8da806348f3ae3ff00f2882ad0645a86b9
+size 1808
diff --git a/assets/voxygen/voxel/sprite/cave/grass_blue_long-0.vox b/assets/voxygen/voxel/sprite/cave/grass_blue_long-0.vox
new file mode 100644
index 0000000000..278b96b50f
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/cave/grass_blue_long-0.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b76e8ca3d721f1cb45bcbf764937749d38d5526e79082ab3b1ab85a8ba842836
+size 1428
diff --git a/assets/voxygen/voxel/sprite/cave/grass_blue_long-1.vox b/assets/voxygen/voxel/sprite/cave/grass_blue_long-1.vox
new file mode 100644
index 0000000000..c3d52b0290
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/cave/grass_blue_long-1.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:77f196647a7f74391d1f9957acf7cb559850618a27239ca64344a2eefbdc06f1
+size 1396
diff --git a/assets/voxygen/voxel/sprite/cave/grass_blue_long-2.vox b/assets/voxygen/voxel/sprite/cave/grass_blue_long-2.vox
new file mode 100644
index 0000000000..d88f9951e7
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/cave/grass_blue_long-2.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e99f856f05ce788529d5566a4ecf56c83433841a47bdbee6dc717bc3dda8d713
+size 1444
diff --git a/assets/voxygen/voxel/sprite/cave/grass_blue_long-3.vox b/assets/voxygen/voxel/sprite/cave/grass_blue_long-3.vox
new file mode 100644
index 0000000000..8ef2f47d3e
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/cave/grass_blue_long-3.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1f9419e6fb25313c7fec015305d18f209396f4e41527debbdf306b8c6c76c90b
+size 1264
diff --git a/assets/voxygen/voxel/sprite/cave/grass_blue_long-4.vox b/assets/voxygen/voxel/sprite/cave/grass_blue_long-4.vox
new file mode 100644
index 0000000000..8ffeb583d2
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/cave/grass_blue_long-4.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e46639e32343a803de848030772ab9489defc4e77f2b3f776fb79ac43af902aa
+size 1404
diff --git a/assets/voxygen/voxel/sprite/cave/grass_blue_long-5.vox b/assets/voxygen/voxel/sprite/cave/grass_blue_long-5.vox
new file mode 100644
index 0000000000..ee35457b26
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/cave/grass_blue_long-5.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:806f6b8887d9f7240d7dc82b135f7609d99d252d740e15a7da0f6150bea31149
+size 1432
diff --git a/assets/voxygen/voxel/sprite/cave/grass_blue_long-6.vox b/assets/voxygen/voxel/sprite/cave/grass_blue_long-6.vox
new file mode 100644
index 0000000000..049a6b4da5
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/cave/grass_blue_long-6.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d4498b70c987f525a2b2feeb3a4974b86c940e5a9b9cfa8d9997f7d9501dbc05
+size 1428
diff --git a/assets/voxygen/voxel/sprite/cave/grass_blue_long-7.vox b/assets/voxygen/voxel/sprite/cave/grass_blue_long-7.vox
new file mode 100644
index 0000000000..256dfaa07f
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/cave/grass_blue_long-7.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:870d8b948b8c21704781825bb750b45477580562ee1d0088d9f1ab008c8e6e9c
+size 1380
diff --git a/assets/voxygen/voxel/sprite/cave/grass_blue_med-0.vox b/assets/voxygen/voxel/sprite/cave/grass_blue_med-0.vox
new file mode 100644
index 0000000000..a4184d8e90
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/cave/grass_blue_med-0.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:941e19009fa39aae441c7fc03a12d0143de51d09c823fad0b8184c48f2263200
+size 1244
diff --git a/assets/voxygen/voxel/sprite/cave/grass_blue_med-1.vox b/assets/voxygen/voxel/sprite/cave/grass_blue_med-1.vox
new file mode 100644
index 0000000000..e077f4f473
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/cave/grass_blue_med-1.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6427235b7aa34db357e403e05ee54ed1ddba9d21a01abaa4d3a97aa1e22e685b
+size 1248
diff --git a/assets/voxygen/voxel/sprite/cave/grass_blue_med-2.vox b/assets/voxygen/voxel/sprite/cave/grass_blue_med-2.vox
new file mode 100644
index 0000000000..8a36087716
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/cave/grass_blue_med-2.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8f3fd71c567f456357c87216832ff606d8b123bcbe0732d36d119f1b9683be56
+size 1288
diff --git a/assets/voxygen/voxel/sprite/cave/grass_blue_med-3.vox b/assets/voxygen/voxel/sprite/cave/grass_blue_med-3.vox
new file mode 100644
index 0000000000..63e1bbd708
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/cave/grass_blue_med-3.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0dfee4fc2ed0776a0ce8eb241392cef2c2f34bf972dfbfc7660dedffe7253808
+size 1232
diff --git a/assets/voxygen/voxel/sprite/cavern/grass_short-0.vox b/assets/voxygen/voxel/sprite/cave/grass_blue_short-0.vox
similarity index 100%
rename from assets/voxygen/voxel/sprite/cavern/grass_short-0.vox
rename to assets/voxygen/voxel/sprite/cave/grass_blue_short-0.vox
diff --git a/assets/voxygen/voxel/sprite/cavern/grass_short-1.vox b/assets/voxygen/voxel/sprite/cave/grass_blue_short-1.vox
similarity index 100%
rename from assets/voxygen/voxel/sprite/cavern/grass_short-1.vox
rename to assets/voxygen/voxel/sprite/cave/grass_blue_short-1.vox
diff --git a/assets/voxygen/voxel/sprite/cavern/grass_short-2.vox b/assets/voxygen/voxel/sprite/cave/grass_blue_short-2.vox
similarity index 100%
rename from assets/voxygen/voxel/sprite/cavern/grass_short-2.vox
rename to assets/voxygen/voxel/sprite/cave/grass_blue_short-2.vox
diff --git a/assets/voxygen/voxel/sprite/cavern/grass_short-3.vox b/assets/voxygen/voxel/sprite/cave/grass_blue_short-3.vox
similarity index 100%
rename from assets/voxygen/voxel/sprite/cavern/grass_short-3.vox
rename to assets/voxygen/voxel/sprite/cave/grass_blue_short-3.vox
diff --git a/assets/voxygen/voxel/sprite/cavern/grass_short-4.vox b/assets/voxygen/voxel/sprite/cave/grass_blue_short-4.vox
similarity index 100%
rename from assets/voxygen/voxel/sprite/cavern/grass_short-4.vox
rename to assets/voxygen/voxel/sprite/cave/grass_blue_short-4.vox
diff --git a/assets/voxygen/voxel/sprite/cave/mushroom-10.vox b/assets/voxygen/voxel/sprite/cave/mushroom-10.vox
new file mode 100644
index 0000000000..5b3f40c82e
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/cave/mushroom-10.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1e7911ad1366527d4b9f602f5c5b2edfa15258a7b562de1798c5bf8efb70df5a
+size 1452
diff --git a/assets/voxygen/voxel/sprite/cave/mushroom-11.vox b/assets/voxygen/voxel/sprite/cave/mushroom-11.vox
new file mode 100644
index 0000000000..7a9cc2328a
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/cave/mushroom-11.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ff20e12796992321a7d853ddad4dee3033dbf6eea010003879e3ba0854314be1
+size 1636
diff --git a/assets/voxygen/voxel/sprite/cave/mushroom-9.vox b/assets/voxygen/voxel/sprite/cave/mushroom-9.vox
new file mode 100644
index 0000000000..27a871aef5
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/cave/mushroom-9.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2330b55ec3cbf670db47c467006437a2dbc3b797ebdc017aef4aa341a93709be
+size 1884
diff --git a/assets/voxygen/voxel/sprite/cave/spore_reed-0.vox b/assets/voxygen/voxel/sprite/cave/spore_reed-0.vox
new file mode 100644
index 0000000000..3da0eec5f0
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/cave/spore_reed-0.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d658194f30de7e43c0ac007c0f2751bd2cb11e4bf5701af8e7dad98e6af0d7e7
+size 1956
diff --git a/assets/voxygen/voxel/sprite/cave/spore_reed-1.vox b/assets/voxygen/voxel/sprite/cave/spore_reed-1.vox
new file mode 100644
index 0000000000..f394a4b4c8
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/cave/spore_reed-1.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6eacd8ee24218c4b3b62f5bdbf9465a464cbca9375c303926797c10e34810f6a
+size 1740
diff --git a/assets/voxygen/voxel/sprite/cave/spore_reed-2.vox b/assets/voxygen/voxel/sprite/cave/spore_reed-2.vox
new file mode 100644
index 0000000000..3b39f49588
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/cave/spore_reed-2.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a087ceb292004756842c404465c36d0a192fa9a9ab4593b87db1c8a77b4e2fac
+size 1648
diff --git a/assets/voxygen/voxel/sprite/cave/spore_reed-3.vox b/assets/voxygen/voxel/sprite/cave/spore_reed-3.vox
new file mode 100644
index 0000000000..bd2135d722
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/cave/spore_reed-3.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aecb94ae2810841d0a99fd72bbd9de1b0a23fa6d1f667d31c8412a2dc077287d
+size 1372
diff --git a/assets/voxygen/voxel/sprite/cavern/grass_long-0.vox b/assets/voxygen/voxel/sprite/cavern/grass_long-0.vox
deleted file mode 100644
index 02a7af7f8c..0000000000
--- a/assets/voxygen/voxel/sprite/cavern/grass_long-0.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:144bb2be7627de61e951085c96038284ae28eed216c6b2c04eb0db596df2f738
-size 1428
diff --git a/assets/voxygen/voxel/sprite/cavern/grass_long-1.vox b/assets/voxygen/voxel/sprite/cavern/grass_long-1.vox
deleted file mode 100644
index 772cfe132a..0000000000
--- a/assets/voxygen/voxel/sprite/cavern/grass_long-1.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c76794542d91c94960373966c2b0232f57801d0a862a117090ba00a7ae934034
-size 1396
diff --git a/assets/voxygen/voxel/sprite/cavern/grass_long-2.vox b/assets/voxygen/voxel/sprite/cavern/grass_long-2.vox
deleted file mode 100644
index e53115ea2a..0000000000
--- a/assets/voxygen/voxel/sprite/cavern/grass_long-2.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:44d27165b605d477f769123ef5d93de7ad357f0b937263ad37ebb8c1480c4324
-size 1444
diff --git a/assets/voxygen/voxel/sprite/cavern/grass_long-3.vox b/assets/voxygen/voxel/sprite/cavern/grass_long-3.vox
deleted file mode 100644
index 6157a2843f..0000000000
--- a/assets/voxygen/voxel/sprite/cavern/grass_long-3.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:44745ce1fef2c4cc1834e82abde5ef6ea3af113b3d3a4cf7df223b833ec07207
-size 1264
diff --git a/assets/voxygen/voxel/sprite/cavern/grass_long-4.vox b/assets/voxygen/voxel/sprite/cavern/grass_long-4.vox
deleted file mode 100644
index d1b9ac74e1..0000000000
--- a/assets/voxygen/voxel/sprite/cavern/grass_long-4.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9439482e006100f8219d27095e1929e15e4cfcd6303b8911a9ce638c30b76966
-size 1404
diff --git a/assets/voxygen/voxel/sprite/cavern/grass_long-5.vox b/assets/voxygen/voxel/sprite/cavern/grass_long-5.vox
deleted file mode 100644
index 3e0c01f98a..0000000000
--- a/assets/voxygen/voxel/sprite/cavern/grass_long-5.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7261c47bb5683e0a0cb1461dc84c5980e7cc1b25f8063b667fef86657e145a68
-size 1432
diff --git a/assets/voxygen/voxel/sprite/cavern/grass_long-6.vox b/assets/voxygen/voxel/sprite/cavern/grass_long-6.vox
deleted file mode 100644
index b8e51f934e..0000000000
--- a/assets/voxygen/voxel/sprite/cavern/grass_long-6.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3bfe9db4fc6e624aa477b04dc6c681e390df65d8c488bf0eb61a86e7d8b7430d
-size 1428
diff --git a/assets/voxygen/voxel/sprite/cavern/grass_long-7.vox b/assets/voxygen/voxel/sprite/cavern/grass_long-7.vox
deleted file mode 100644
index 5d7ffe064c..0000000000
--- a/assets/voxygen/voxel/sprite/cavern/grass_long-7.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:eec0a1b111d12f022e973e14afaf2e8f81fd7c6e4676a29cbc2f698f75a13e95
-size 1380
diff --git a/assets/voxygen/voxel/sprite/cavern/grass_med-0.vox b/assets/voxygen/voxel/sprite/cavern/grass_med-0.vox
deleted file mode 100644
index 452bd9f440..0000000000
--- a/assets/voxygen/voxel/sprite/cavern/grass_med-0.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7496e27724e51a4129955a304cc10a15447845687e817140464da7f69be92386
-size 1244
diff --git a/assets/voxygen/voxel/sprite/cavern/grass_med-1.vox b/assets/voxygen/voxel/sprite/cavern/grass_med-1.vox
deleted file mode 100644
index 6f79383e6a..0000000000
--- a/assets/voxygen/voxel/sprite/cavern/grass_med-1.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7decc0743714a30208440e9437caaa77de79d730a9d7e060a4625c621ab30feb
-size 1248
diff --git a/assets/voxygen/voxel/sprite/cavern/grass_med-2.vox b/assets/voxygen/voxel/sprite/cavern/grass_med-2.vox
deleted file mode 100644
index 2f2f65d819..0000000000
--- a/assets/voxygen/voxel/sprite/cavern/grass_med-2.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:05c12e2e4d82b186c422f0da4617e17dd72f45b48071a3a7567fb186b581d4d2
-size 1288
diff --git a/assets/voxygen/voxel/sprite/cavern/grass_med-3.vox b/assets/voxygen/voxel/sprite/cavern/grass_med-3.vox
deleted file mode 100644
index 4e657e7fe8..0000000000
--- a/assets/voxygen/voxel/sprite/cavern/grass_med-3.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:92fbd926d0e40ae777286c85d1cd56547717a0fc74f6d34611394113d063c74b
-size 1232
diff --git a/assets/voxygen/voxel/sprite/cavern/mycel-0.vox b/assets/voxygen/voxel/sprite/cavern/mycel-0.vox
deleted file mode 100644
index 4f3d86f73b..0000000000
--- a/assets/voxygen/voxel/sprite/cavern/mycel-0.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3d7180c8469565f8836b1e795c94faecab5fb97c1d3d9b3c1d50fd202bb23d6f
-size 1180
diff --git a/assets/voxygen/voxel/sprite/cavern/mycel-1.vox b/assets/voxygen/voxel/sprite/cavern/mycel-1.vox
deleted file mode 100644
index 44ff474b6e..0000000000
--- a/assets/voxygen/voxel/sprite/cavern/mycel-1.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:10c3aa05a02e9431d2bf25fa473218c4c91ad62252ee3d8383e82a57cbcff1bb
-size 1220
diff --git a/assets/voxygen/voxel/sprite/cavern/mycel-2.vox b/assets/voxygen/voxel/sprite/cavern/mycel-2.vox
deleted file mode 100644
index a63c1a67af..0000000000
--- a/assets/voxygen/voxel/sprite/cavern/mycel-2.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0516877cbf4caa6370c2dbf3c957b294c12a93db8e805dd858e43c91d17ee36c
-size 1152
diff --git a/assets/voxygen/voxel/sprite/cavern/mycel-3.vox b/assets/voxygen/voxel/sprite/cavern/mycel-3.vox
deleted file mode 100644
index 764d35b66e..0000000000
--- a/assets/voxygen/voxel/sprite/cavern/mycel-3.vox
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6d3ceb2b40579d0b885280d80e8e52179d6696fe99ff4612ee2c9931ec0543bc
-size 1256
diff --git a/assets/voxygen/voxel/sprite/dead_plant/dead_plant-0.vox b/assets/voxygen/voxel/sprite/dead_plant/dead_plant-0.vox
new file mode 100644
index 0000000000..82b695dcdb
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/dead_plant/dead_plant-0.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:325906029c1c3d0ae79f282677817e2b6e4634c40c665a9b413dfe23deb5b87e
+size 1308
diff --git a/assets/voxygen/voxel/sprite/dead_plant/dead_plant-1.vox b/assets/voxygen/voxel/sprite/dead_plant/dead_plant-1.vox
new file mode 100644
index 0000000000..237fb7bc9c
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/dead_plant/dead_plant-1.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4c59380ff24f6ddde29a2d2018ae5eee996dd6af7ea6b820974929677a74a35d
+size 1280
diff --git a/assets/voxygen/voxel/sprite/dead_plant/dead_plant-2.vox b/assets/voxygen/voxel/sprite/dead_plant/dead_plant-2.vox
new file mode 100644
index 0000000000..d76b5745bb
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/dead_plant/dead_plant-2.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:891583126c09f134eda53b675a3c18bdfd299a84939e73dc276a5689d05de2f0
+size 1192
diff --git a/assets/voxygen/voxel/sprite/dead_plant/dead_plant-3.vox b/assets/voxygen/voxel/sprite/dead_plant/dead_plant-3.vox
new file mode 100644
index 0000000000..63e3970ac0
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/dead_plant/dead_plant-3.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0afa6f113b4f161f33f40d2dea097cb2ecc38eaf164478850190aa5ddccd7ebc
+size 1236
diff --git a/assets/voxygen/voxel/sprite/leafy_plant/1.vox b/assets/voxygen/voxel/sprite/leafy_plant/1.vox
index 13258089d6..f4c6ee9973 100644
--- a/assets/voxygen/voxel/sprite/leafy_plant/1.vox
+++ b/assets/voxygen/voxel/sprite/leafy_plant/1.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2f7230dc9d14f13b7bad03fcc2cda7922e6898745c18791916d8fa59c5709bcb
-size 1892
+oid sha256:9525a447698343edd41376d17ee9d3bbf994d09df56b79883e5f9dd78298c3e6
+size 1876
diff --git a/assets/voxygen/voxel/sprite/leafy_plant/10.vox b/assets/voxygen/voxel/sprite/leafy_plant/10.vox
index 73d3b3901d..f73c307a28 100644
--- a/assets/voxygen/voxel/sprite/leafy_plant/10.vox
+++ b/assets/voxygen/voxel/sprite/leafy_plant/10.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:63accce104181146bbe0e02f7c1f22f3d849387c4da7975c23e6d9aa0174f8fa
-size 1160
+oid sha256:20d22e75a55607b46ad49f53f5bd24db8d9f08ed602e71bfee8b00fc0267e1ec
+size 1236
diff --git a/assets/voxygen/voxel/sprite/leafy_plant/2.vox b/assets/voxygen/voxel/sprite/leafy_plant/2.vox
index daddc2cd70..0ee6c528e1 100644
--- a/assets/voxygen/voxel/sprite/leafy_plant/2.vox
+++ b/assets/voxygen/voxel/sprite/leafy_plant/2.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:56fff236d95573b242fa086eb7c9d0ea88199d1b1c4509d072a84ff389c43618
-size 1340
+oid sha256:52f494a4636c7fcc11a2d229a13c8ebc7b8f608807bcd29891b8d25a4e63bdb5
+size 1372
diff --git a/assets/voxygen/voxel/sprite/leafy_plant/3.vox b/assets/voxygen/voxel/sprite/leafy_plant/3.vox
index a4cb1b017d..803acab16e 100644
--- a/assets/voxygen/voxel/sprite/leafy_plant/3.vox
+++ b/assets/voxygen/voxel/sprite/leafy_plant/3.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b376fd6ae77ee6b70b840ae836c3f45f9a534982793b6399b1e75e80f340ce40
-size 1432
+oid sha256:2ab99313cb91c8118067cfe1275affe766658da941d73a83a0e400f5c6e8c8a9
+size 2044
diff --git a/assets/voxygen/voxel/sprite/leafy_plant/4.vox b/assets/voxygen/voxel/sprite/leafy_plant/4.vox
index 21506dc484..2cb7810214 100644
--- a/assets/voxygen/voxel/sprite/leafy_plant/4.vox
+++ b/assets/voxygen/voxel/sprite/leafy_plant/4.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b486ba258a8e9b780ce48a660814762593306520b901e058b5f803e50b4ed7f9
-size 1308
+oid sha256:1506b5b2e15404b1e17812c78bac8711c6def87fd61a0882a74341c67f6f5ab2
+size 1484
diff --git a/assets/voxygen/voxel/sprite/leafy_plant/5.vox b/assets/voxygen/voxel/sprite/leafy_plant/5.vox
index 6dca485f98..6b12574fb1 100644
--- a/assets/voxygen/voxel/sprite/leafy_plant/5.vox
+++ b/assets/voxygen/voxel/sprite/leafy_plant/5.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:96113dd1de793a91c1b4eda784f89cc65396c41aa930274c748ee7afce666de0
-size 1284
+oid sha256:db158665c455aacba759303c6fd3a0c95ddfbaac19a48aa3a1fc99a2246468b4
+size 1804
diff --git a/assets/voxygen/voxel/sprite/leafy_plant/6.vox b/assets/voxygen/voxel/sprite/leafy_plant/6.vox
index 1ea45c7fe1..453199fe24 100644
--- a/assets/voxygen/voxel/sprite/leafy_plant/6.vox
+++ b/assets/voxygen/voxel/sprite/leafy_plant/6.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2546700413ad30593ca2f51c22f1b51dc9b94b43c9cbaa38ffecf18a7addbd07
-size 1292
+oid sha256:ad4413aa053b09002b355d509a45538ae2546e69f81eccd34499566626cb1827
+size 1580
diff --git a/assets/voxygen/voxel/sprite/leafy_plant/7.vox b/assets/voxygen/voxel/sprite/leafy_plant/7.vox
index 57d2ee507f..2cb0bdf5e1 100644
--- a/assets/voxygen/voxel/sprite/leafy_plant/7.vox
+++ b/assets/voxygen/voxel/sprite/leafy_plant/7.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c50625eb6a07a0a3eb04975fa769b6301ad0f4f05f433adb1e3cb5b6b85b712d
-size 1252
+oid sha256:45e171e6ce24371bbab7dc2a54023ef279a89a53af96c30577c1d9659bd3087f
+size 1820
diff --git a/assets/voxygen/voxel/sprite/leafy_plant/8.vox b/assets/voxygen/voxel/sprite/leafy_plant/8.vox
index f75a876043..e940ba77cb 100644
--- a/assets/voxygen/voxel/sprite/leafy_plant/8.vox
+++ b/assets/voxygen/voxel/sprite/leafy_plant/8.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5d37384289721949cfeb63c6429454d0356470c52a0d682a1147be46e801fa4d
-size 1340
+oid sha256:55c8036250c374478f37da3a3a09f18183a2af88daedf324cf8e846f1563c1fd
+size 1608
diff --git a/assets/voxygen/voxel/sprite/leafy_plant/9.vox b/assets/voxygen/voxel/sprite/leafy_plant/9.vox
index b4996a9d93..9d480bba6a 100644
--- a/assets/voxygen/voxel/sprite/leafy_plant/9.vox
+++ b/assets/voxygen/voxel/sprite/leafy_plant/9.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:74ffee6cdbda6bfed82453eb285a8d6f3d4bbc01abed21d73a96caf1ef075188
-size 1188
+oid sha256:91d5a6cb6ec9b74cab5a57f5e480f7cbd0472f063fbb37e4449b817cbb032bc3
+size 1320
diff --git a/assets/voxygen/voxel/sprite/leafy_plant/jungle_plant_ceiling-0.vox b/assets/voxygen/voxel/sprite/leafy_plant/jungle_plant_ceiling-0.vox
new file mode 100644
index 0000000000..481987e1f1
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/leafy_plant/jungle_plant_ceiling-0.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:203199ae6be0e8c086262dac995e54dab02651b6de5238c3ae54625adc32b09d
+size 1336
diff --git a/assets/voxygen/voxel/sprite/leafy_plant/jungle_plant_ceiling-1.vox b/assets/voxygen/voxel/sprite/leafy_plant/jungle_plant_ceiling-1.vox
new file mode 100644
index 0000000000..7890ecb1d9
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/leafy_plant/jungle_plant_ceiling-1.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cd3386610963273712d388b8c580163ffa4a602bd82352e6ad7e4f158568ce9d
+size 1472
diff --git a/assets/voxygen/voxel/sprite/leafy_plant/jungle_plant_ceiling-2.vox b/assets/voxygen/voxel/sprite/leafy_plant/jungle_plant_ceiling-2.vox
new file mode 100644
index 0000000000..dc20aee456
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/leafy_plant/jungle_plant_ceiling-2.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:277484b32c9ad55804b32ad9e960c1a1bf38729e7a92c134272b3f27ae69ca6c
+size 1460
diff --git a/assets/voxygen/voxel/sprite/leafy_plant/jungle_plant_ceiling-3.vox b/assets/voxygen/voxel/sprite/leafy_plant/jungle_plant_ceiling-3.vox
new file mode 100644
index 0000000000..c9f4523644
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/leafy_plant/jungle_plant_ceiling-3.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6de8c164400d98aee06ef992add76601f41ad970305f2456cd542768d8bd2841
+size 1540
diff --git a/assets/voxygen/voxel/sprite/leafy_plant/jungle_plant_ceiling-4.vox b/assets/voxygen/voxel/sprite/leafy_plant/jungle_plant_ceiling-4.vox
new file mode 100644
index 0000000000..bba1499c91
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/leafy_plant/jungle_plant_ceiling-4.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6e55f3b7dd4ab6825f670c739e91a29a454ee871b7556f68eb05043af833634c
+size 1752
diff --git a/assets/voxygen/voxel/sprite/mushrooms/mushroom-0.vox b/assets/voxygen/voxel/sprite/mushrooms/mushroom-0.vox
index a2824a0262..a8d38710b2 100644
--- a/assets/voxygen/voxel/sprite/mushrooms/mushroom-0.vox
+++ b/assets/voxygen/voxel/sprite/mushrooms/mushroom-0.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:65ed706fdb0b4ac5e66f22d2edcfc78dea308a51f3616e35cadac11ce8c22656
-size 1160
+oid sha256:b8e4af46fbeb52e2defd77354c5c4f0f3c5b6e0b61a56f0bda4de94ae746a3c4
+size 1460
diff --git a/assets/voxygen/voxel/sprite/mushrooms/mushroom-1.vox b/assets/voxygen/voxel/sprite/mushrooms/mushroom-1.vox
index bd29d728cc..1d4dad4f95 100644
--- a/assets/voxygen/voxel/sprite/mushrooms/mushroom-1.vox
+++ b/assets/voxygen/voxel/sprite/mushrooms/mushroom-1.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:83ca8cf16bbac82da89a0102513e7c54edd75f3b772cdb5aa0981c117045db33
-size 1204
+oid sha256:d12bd2ec8a2b172acd40a7b85571a213dfe6cb426446eb0ca2fb7bc2bfae5f1a
+size 1440
diff --git a/assets/voxygen/voxel/sprite/mushrooms/mushroom-10.vox b/assets/voxygen/voxel/sprite/mushrooms/mushroom-10.vox
index f293502f1b..33662b1423 100644
--- a/assets/voxygen/voxel/sprite/mushrooms/mushroom-10.vox
+++ b/assets/voxygen/voxel/sprite/mushrooms/mushroom-10.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1bd2decf66c5b2c4712e7f2ae77ae4c530e79373a0ceed111f7254e98dbced6c
-size 1448
+oid sha256:ad534b54ce5c7456e0e5b6365fe4ec2c7f3f8d7c7182899261e30bbb0ab29f59
+size 1748
diff --git a/assets/voxygen/voxel/sprite/mushrooms/mushroom-2.vox b/assets/voxygen/voxel/sprite/mushrooms/mushroom-2.vox
index 5f2378a8d7..eb71303649 100644
--- a/assets/voxygen/voxel/sprite/mushrooms/mushroom-2.vox
+++ b/assets/voxygen/voxel/sprite/mushrooms/mushroom-2.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b67de880999ab46de70e8579ed5054f3838c354a7a74ed382c4e2abc1ea16f27
-size 1160
+oid sha256:d51975bcb9e5bc73cf5edaf510cb76314457bc83ddebeaf3cb18668f76ab011f
+size 1328
diff --git a/assets/voxygen/voxel/sprite/mushrooms/mushroom-3.vox b/assets/voxygen/voxel/sprite/mushrooms/mushroom-3.vox
index fac5b3ca1f..5a736133fe 100644
--- a/assets/voxygen/voxel/sprite/mushrooms/mushroom-3.vox
+++ b/assets/voxygen/voxel/sprite/mushrooms/mushroom-3.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d262dc556c2c28fbba8d964aa7c2c42d78bec410e3aa1ee71eb353a7701a8b0e
-size 1244
+oid sha256:5e83595d72a91a33b298fdb350be172ec167cf3823d719d74eade52a32ea5246
+size 1368
diff --git a/assets/voxygen/voxel/sprite/mushrooms/mushroom-4.vox b/assets/voxygen/voxel/sprite/mushrooms/mushroom-4.vox
index b7e0dba6dc..b993fb3141 100644
--- a/assets/voxygen/voxel/sprite/mushrooms/mushroom-4.vox
+++ b/assets/voxygen/voxel/sprite/mushrooms/mushroom-4.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:192b8f2baddda973d5b9e55e2aaf0fe8dcb3ddc5be5d242cd6bab319b6f8a763
-size 1448
+oid sha256:7be406856dc790d50b73ff194a3cba8033751f2d819524a5759ef6d6d60fc5c1
+size 1648
diff --git a/assets/voxygen/voxel/sprite/mushrooms/mushroom-5.vox b/assets/voxygen/voxel/sprite/mushrooms/mushroom-5.vox
index f32e812b5d..529935cb69 100644
--- a/assets/voxygen/voxel/sprite/mushrooms/mushroom-5.vox
+++ b/assets/voxygen/voxel/sprite/mushrooms/mushroom-5.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5811aaf9f24505b2d089c9adc176ec906b746b506ae7e64434bc10638b3efd00
-size 1512
+oid sha256:c7d93cfbf41755b4fd14b2562de6f4b41a50032907d740ee70fd3c17eb7c1207
+size 2004
diff --git a/assets/voxygen/voxel/sprite/mushrooms/mushroom-6.vox b/assets/voxygen/voxel/sprite/mushrooms/mushroom-6.vox
index a3af68eb4a..dc822fdadf 100644
--- a/assets/voxygen/voxel/sprite/mushrooms/mushroom-6.vox
+++ b/assets/voxygen/voxel/sprite/mushrooms/mushroom-6.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:588d579a9c4dc18c5795459eb27b89082ace9ffabc2034815a0cff750464c9be
-size 1340
+oid sha256:a505d307d4bc865bde485215a1d4eeaae48ed4b1284bfec90c9349e159f02b21
+size 1708
diff --git a/assets/voxygen/voxel/sprite/mushrooms/mushroom-7.vox b/assets/voxygen/voxel/sprite/mushrooms/mushroom-7.vox
index 0a5fa93168..c853b7946d 100644
--- a/assets/voxygen/voxel/sprite/mushrooms/mushroom-7.vox
+++ b/assets/voxygen/voxel/sprite/mushrooms/mushroom-7.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e0c01c8e11e19b510b7762389782721d55737857ed49230b557a59f10c5e932c
-size 1224
+oid sha256:deb044efce4e3012a5f3ba3164499dc8f08bdd80c82af4d09702518f0c9c468d
+size 1372
diff --git a/assets/voxygen/voxel/sprite/mushrooms/mushroom-8.vox b/assets/voxygen/voxel/sprite/mushrooms/mushroom-8.vox
index 9ce82ae5a2..4113f2ef47 100644
--- a/assets/voxygen/voxel/sprite/mushrooms/mushroom-8.vox
+++ b/assets/voxygen/voxel/sprite/mushrooms/mushroom-8.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0ba9246881224580ae0b3df4a4ed7da8119744c48c62f2ab68eec3bb988a9513
-size 1252
+oid sha256:61c68b179303f378fc018ec12f6e99d26a709970d14000df21f484a5528633b1
+size 1596
diff --git a/assets/voxygen/voxel/sprite/mushrooms/mushroom-9.vox b/assets/voxygen/voxel/sprite/mushrooms/mushroom-9.vox
index a081aa830e..c8ca537dfd 100644
--- a/assets/voxygen/voxel/sprite/mushrooms/mushroom-9.vox
+++ b/assets/voxygen/voxel/sprite/mushrooms/mushroom-9.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:845460d4711a46dfd8666ed99591d50e846d3c35cc78e1a8fb2db62eba459d93
-size 1432
+oid sha256:46986e4b3c3e9a84cc6e43656140e206a22c08fee63b02dacf61b116806b9869
+size 2116
diff --git a/assets/voxygen/voxel/sprite_manifest.ron b/assets/voxygen/voxel/sprite_manifest.ron
index f96cfae70f..69de6ff461 100644
--- a/assets/voxygen/voxel/sprite_manifest.ron
+++ b/assets/voxygen/voxel/sprite_manifest.ron
@@ -610,6 +610,139 @@ SewerMushroom: Some((
     ],
     wind_sway: 0.0,
 )),
+// Lush cave biome mushrooms
+LushMushroom: Some((
+    variations: [
+        (
+            model: "voxygen.voxel.sprite.mushrooms.mushroom-0",
+            offset: (-6.0, -6.0, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.mushrooms.mushroom-1",
+            offset: (-6.0, -6.0, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.mushrooms.mushroom-2",
+            offset: (-6.0, -6.0, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.mushrooms.mushroom-4",
+            offset: (-6.0, -6.0, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.mushrooms.mushroom-5",
+            offset: (-6.0, -6.0, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.mushrooms.mushroom-6",
+            offset: (-6.0, -6.0, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.mushrooms.mushroom-9",
+            offset: (-6.0, -6.0, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cave.mushroom-1",
+            offset: (-5.0, -5.5, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+    ],
+    wind_sway: 0.0,
+)),
+// Rocky cave biome mushrooms
+RockyMushroom: Some((
+    variations: [
+        (
+            model: "voxygen.voxel.sprite.cave.mushroom-0",
+            offset: (-8.0, -8.0, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cave.mushroom-2",
+            offset: (-5.5, -5.5, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cave.mushroom-9",
+            offset: (-8.0, -8.0, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cave.mushroom-10",
+            offset: (-8.0, -8.0, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cave.mushroom-11",
+            offset: (-8.0, -8.0, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+    ],
+    wind_sway: 0.0,
+)),
+// Mushroom cave biome mushrooms
+GlowMushroom: Some((
+    variations: [
+        (
+            model: "voxygen.voxel.sprite.cave.mushroom-3",
+            offset: (-2.5, -2.5, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cave.mushroom-4",
+            offset: (-1.5, -1.5, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cave.mushroom-5",
+            offset: (-5.5, -5.5, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cave.mushroom-6",
+            offset: (-8.5, -8.5, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cave.mushroom-7",
+            offset: (-11.5, -11.5, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cave.mushroom-8",
+            offset: (-12.5, -15.5, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.mushrooms.mushroom-3",
+            offset: (-6.0, -6.0, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.mushrooms.mushroom-7",
+            offset: (-6.0, -6.0, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.mushrooms.mushroom-8",
+            offset: (-6.0, -6.0, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.mushrooms.mushroom-10",
+            offset: (-6.0, -6.0, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+    ],
+    wind_sway: 0.0,
+)),
 // Cave Mushrooms
 CaveMushroom: Some((
     variations: [
@@ -679,6 +812,11 @@ CeilingMushroom: Some((
             offset: (-11.5, -11.5, -17.0),
             lod_axes: (1.0, 1.0, 1.0),
         ),
+    ],
+    wind_sway: 0.0,
+)),
+Mold: Some((
+    variations: [
         (
             model: "voxygen.voxel.sprite.cave.ceiling.mold-0",
             offset: (-5.5, -5.5, 0.0),
@@ -696,22 +834,217 @@ CeilingMushroom: Some((
         ),
         (
             model: "voxygen.voxel.sprite.cave.ceiling.mold-3",
-            offset: (-5.5, -5.5, 2.0),
+            offset: (-5.5, -5.5, -2.0),
             lod_axes: (1.0, 1.0, 1.0),
         ),
         (
             model: "voxygen.voxel.sprite.cave.ceiling.mold-4",
-            offset: (-2.0, -2.0, -49.0),
+            offset: (-5.5, -5.5, -13.0),
             lod_axes: (1.0, 1.0, 1.0),
         ),
         (
             model: "voxygen.voxel.sprite.cave.ceiling.mold-5",
-            offset: (-2.0, -2.0, -79.0),
+            offset: (-5.5, -5.5, -19.0),
             lod_axes: (1.0, 1.0, 1.0),
         ),
         (
             model: "voxygen.voxel.sprite.cave.ceiling.mold-6",
-            offset: (-2.0, -2.0, -79.0),
+            offset: (-5.5, -5.5, -24.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+    ],
+    wind_sway: 0.0,
+)),
+Root: Some((
+    variations: [
+        (
+            model: "voxygen.voxel.sprite.cave.ceiling.root-0",
+            offset: (-3.0, -2.5, -22.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cave.ceiling.root-1",
+            offset: (-2.5, -2.5, -34.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cave.ceiling.root-2",
+            offset: (-2.5, -2.5, -31.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cave.ceiling.root-3",
+            offset: (-2.5, -2.5, -24.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cave.ceiling.root-4",
+            offset: (-2.5, -2.5, -16.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cave.ceiling.root-5",
+            offset: (-2.5, -2.5, -16.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cave.ceiling.root-6",
+            offset: (-2.5, -2.5, -33.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+    ],
+    wind_sway: 0.0,
+)),
+CeilingLanternPlant: Some((
+    variations: [
+        (
+            model: "voxygen.voxel.sprite.cave.ceiling.cave_lantern_plant-0",
+            offset: (-7.5, -5.5, -23.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cave.ceiling.cave_lantern_plant-1",
+            offset: (-7.5, -5.5, -16.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+    ],
+    wind_sway: 0.0,
+)),
+CeilingLanternFlower: Some((
+    variations: [
+        (
+            model: "voxygen.voxel.sprite.cave.ceiling.cave_lantern_flower-0",
+            offset: (-7.5, -7.5, 3.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cave.ceiling.cave_lantern_flower-1",
+            offset: (-6.5, -6.5, 1.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cave.ceiling.cave_lantern_flower-2",
+            offset: (-7.5, -7.5, 4.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+    ],
+    wind_sway: 0.0,
+)),
+CeilingJungleLeafyPlant: Some((
+    variations: [
+        (
+            model: "voxygen.voxel.sprite.leafy_plant.jungle_plant_ceiling-0",
+            offset: (-5.5, -1.5, -1.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.leafy_plant.jungle_plant_ceiling-1",
+            offset: (-6.5, -2.5, -3.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.leafy_plant.jungle_plant_ceiling-2",
+            offset: (-6.5, -2.5, -5.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.leafy_plant.jungle_plant_ceiling-3",
+            offset: (-7.5, -2.5, -5.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.leafy_plant.jungle_plant_ceiling-4",
+            offset: (-7.5, -5.5, -11.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+    ],
+    wind_sway: 0.4,
+)),
+LushFlower: Some((
+    variations: [
+        (
+            model: "voxygen.voxel.sprite.cave.cave_flower-0",
+            offset: (-5.0, -5.0, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cave.cave_flower-1",
+            offset: (-5.5, -5.0, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cave.cave_flower-2",
+            offset: (-4.5, -4.5, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cave.cave_flower-3",
+            offset: (-5.5, -3.5, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+    ],
+    wind_sway: 0.0,
+)),
+LanternFlower: Some((
+    variations: [
+        (
+            model: "voxygen.voxel.sprite.cave.cave_lantern_flower-0",
+            offset: (-7.5, -7.5, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cave.cave_lantern_flower-1",
+            offset: (-11.5, -11.5, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cave.cave_lantern_flower-2",
+            offset: (-7.5, -7.5, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+    ],
+    wind_sway: 0.0,
+)),
+LanternPlant: Some((
+    variations: [
+        (
+            model: "voxygen.voxel.sprite.cave.cave_lantern_plant-0",
+            offset: (-7.5, -7.5, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cave.cave_lantern_plant-1",
+            offset: (-11.5, -11.5, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cave.cave_lantern_plant-2",
+            offset: (-7.5, -7.5, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+    ],
+    wind_sway: 0.0,
+)),
+SporeReed: Some((
+    variations: [
+        (
+            model: "voxygen.voxel.sprite.cave.spore_reed-0",
+            offset: (-5.5, -5.5, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cave.spore_reed-1",
+            offset: (-4.0, -5.0, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cave.spore_reed-2",
+            offset: (-4.5, -5.0, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.cave.spore_reed-3",
+            offset: (-3.0, -2.5, 0.0),
             lod_axes: (1.0, 1.0, 1.0),
         ),
     ],
@@ -1594,6 +1927,32 @@ DeadBush: Some((
     ],
     wind_sway: 0.2,
 )),
+// Dead Plant
+DeadPlant: Some((
+    variations: [
+        (
+            model: "voxygen.voxel.sprite.dead_plant.dead_plant-0",
+            offset: (-6.0, -6.0, -0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.dead_plant.dead_plant-1",
+            offset: (-6.0, -6.0, -0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.dead_plant.dead_plant-2",
+            offset: (-6.0, -6.0, -0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.dead_plant.dead_plant-3",
+            offset: (-6.0, -6.0, -0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+    ],
+    wind_sway: 0.2,
+)),
 // Blueberries
 // NOTE: Why are these commented out?
 Blueberry: None/* (
@@ -4113,103 +4472,103 @@ Bones: Some((
     ],
     wind_sway: 0.0,
 )),
-// Short Cavern Grass Blue
-CavernGrassBlueShort: Some((
+// Short Grass Blue
+GrassBlueShort: Some((
     variations: [
         (
-            model: "voxygen.voxel.sprite.cavern.grass_short-0",
+            model: "voxygen.voxel.sprite.cave.grass_blue_short-0",
             offset: (-5.5, -5.5, 0.0),
             lod_axes: (0.0, 0.0, 1.0),
         ),
         (
-            model: "voxygen.voxel.sprite.cavern.grass_short-1",
+            model: "voxygen.voxel.sprite.cave.grass_blue_short-1",
             offset: (-5.5, -5.5, 0.0),
             lod_axes: (0.0, 0.0, 1.0),
         ),
         (
-            model: "voxygen.voxel.sprite.cavern.grass_short-2",
+            model: "voxygen.voxel.sprite.cave.grass_blue_short-2",
             offset: (-5.5, -5.5, 0.0),
             lod_axes: (0.0, 0.0, 1.0),
         ),
         (
-            model: "voxygen.voxel.sprite.cavern.grass_short-3",
+            model: "voxygen.voxel.sprite.cave.grass_blue_short-3",
             offset: (-5.5, -5.5, 0.0),
             lod_axes: (0.0, 0.0, 1.0),
         ),
         (
-            model: "voxygen.voxel.sprite.cavern.grass_short-4",
+            model: "voxygen.voxel.sprite.cave.grass_blue_short-4",
             offset: (-5.5, -5.5, 0.0),
             lod_axes: (0.0, 0.0, 1.0),
         ),
     ],
     wind_sway: 0.0,
 )),
-// Medium Cavern Grass Blue
-CavernGrassBlueMedium: Some((
+// Medium Grass Blue
+GrassBlueMedium: Some((
     variations: [
         (
-            model: "voxygen.voxel.sprite.cavern.grass_med-0",
+            model: "voxygen.voxel.sprite.cave.grass_blue_med-0",
             offset: (-5.5, -5.5, 0.0),
             lod_axes: (0.0, 0.0, 1.0),
         ),
         (
-            model: "voxygen.voxel.sprite.cavern.grass_med-1",
+            model: "voxygen.voxel.sprite.cave.grass_blue_med-1",
             offset: (-5.5, -5.5, 0.0),
             lod_axes: (0.0, 0.0, 1.0),
         ),
         (
-            model: "voxygen.voxel.sprite.cavern.grass_med-2",
+            model: "voxygen.voxel.sprite.cave.grass_blue_med-2",
             offset: (-5.5, -5.5, 0.0),
             lod_axes: (0.0, 0.0, 1.0),
         ),
         (
-            model: "voxygen.voxel.sprite.cavern.grass_med-3",
+            model: "voxygen.voxel.sprite.cave.grass_blue_med-3",
             offset: (-5.5, -5.5, 0.0),
             lod_axes: (0.0, 0.0, 1.0),
         ),
     ],
     wind_sway: 0.0,
 )),
-// Long Cavern Grass Blue
-CavernGrassBlueLong: Some((
+// Long Grass Blue
+GrassBlueLong: Some((
     variations: [
         (
-            model: "voxygen.voxel.sprite.cavern.grass_long-0",
+            model: "voxygen.voxel.sprite.cave.grass_blue_long-0",
             offset: (-5.5, -5.5, 0.0),
             lod_axes: (0.0, 0.0, 1.0),
         ),
         (
-            model: "voxygen.voxel.sprite.cavern.grass_long-1",
+            model: "voxygen.voxel.sprite.cave.grass_blue_long-1",
             offset: (-5.5, -5.5, 0.0),
             lod_axes: (0.0, 0.0, 1.0),
         ),
         (
-            model: "voxygen.voxel.sprite.cavern.grass_long-2",
+            model: "voxygen.voxel.sprite.cave.grass_blue_long-2",
             offset: (-5.5, -5.5, 0.0),
             lod_axes: (0.0, 0.0, 1.0),
         ),
         (
-            model: "voxygen.voxel.sprite.cavern.grass_long-3",
+            model: "voxygen.voxel.sprite.cave.grass_blue_long-3",
             offset: (-5.5, -5.5, 0.0),
             lod_axes: (0.0, 0.0, 1.0),
         ),
         (
-            model: "voxygen.voxel.sprite.cavern.grass_long-4",
+            model: "voxygen.voxel.sprite.cave.grass_blue_long-4",
             offset: (-5.5, -5.5, 0.0),
             lod_axes: (0.0, 0.0, 1.0),
         ),
         (
-            model: "voxygen.voxel.sprite.cavern.grass_long-5",
+            model: "voxygen.voxel.sprite.cave.grass_blue_long-5",
             offset: (-5.5, -5.5, 0.0),
             lod_axes: (0.0, 0.0, 1.0),
         ),
         (
-            model: "voxygen.voxel.sprite.cavern.grass_long-6",
+            model: "voxygen.voxel.sprite.cave.grass_blue_long-6",
             offset: (-5.5, -5.5, 0.0),
             lod_axes: (0.0, 0.0, 1.0),
         ),
         (
-            model: "voxygen.voxel.sprite.cavern.grass_long-7",
+            model: "voxygen.voxel.sprite.cave.grass_blue_long-7",
             offset: (-5.5, -5.5, 0.0),
             lod_axes: (0.0, 0.0, 1.0),
         ),
@@ -4247,27 +4606,27 @@ CavernLillypadBlue: Some((
     ],
     wind_sway: 0.0,
 )),
-// Cavern Hanging Mycel Blue
-CavernMycelBlue: Some((
+// Cave Hanging Mycel Blue
+MycelBlue: Some((
     variations: [
         (
-            model: "voxygen.voxel.sprite.cavern.mycel-0",
-            offset: (-0.5, -0.5, -21.0),
+            model: "voxygen.voxel.sprite.cave.ceiling.mycel-0",
+            offset: (-1.0, -1.0, -12.0),
             lod_axes: (0.0, 0.0, 1.0),
         ),
         (
-            model: "voxygen.voxel.sprite.cavern.mycel-1",
-            offset: (-0.5, -0.5, -31.0),
+            model: "voxygen.voxel.sprite.cave.ceiling.mycel-1",
+            offset: (-1.0, -1.0, -25.0),
             lod_axes: (0.0, 0.0, 1.0),
         ),
         (
-            model: "voxygen.voxel.sprite.cavern.mycel-2",
-            offset: (-0.5, -0.5, -14.0),
+            model: "voxygen.voxel.sprite.cave.ceiling.mycel-2",
+            offset: (-1.0, -1.0, -18.0),
             lod_axes: (0.0, 0.0, 1.0),
         ),
         (
-            model: "voxygen.voxel.sprite.cavern.mycel-3",
-            offset: (-0.5, -0.5, -40.0),
+            model: "voxygen.voxel.sprite.cave.ceiling.mycel-3",
+            offset: (-1.0, -1.0, -29.0),
             lod_axes: (0.0, 0.0, 1.0),
         ),
     ],
diff --git a/common/src/terrain/block.rs b/common/src/terrain/block.rs
index bd2a4bc06a..35a2d3f8f3 100644
--- a/common/src/terrain/block.rs
+++ b/common/src/terrain/block.rs
@@ -354,7 +354,10 @@ impl Block {
                 | SpriteKind::Turnip => Some(rtsim::ChunkResource::Vegetable),
             SpriteKind::Mushroom
                 | SpriteKind::CaveMushroom
-                | SpriteKind::CeilingMushroom => Some(rtsim::ChunkResource::Mushroom),
+                | SpriteKind::CeilingMushroom
+                | SpriteKind::RockyMushroom
+                | SpriteKind::LushMushroom
+                | SpriteKind::GlowMushroom => Some(rtsim::ChunkResource::Mushroom),
 
             SpriteKind::Chest
                 | SpriteKind::ChestBuried
@@ -393,15 +396,21 @@ impl Block {
                 SpriteKind::DiamondLight => 30,
                 SpriteKind::Velorite
                 | SpriteKind::VeloriteFrag
-                | SpriteKind::CavernGrassBlueShort
-                | SpriteKind::CavernGrassBlueMedium
-                | SpriteKind::CavernGrassBlueLong
+                | SpriteKind::GrassBlueShort
+                | SpriteKind::GrassBlueMedium
+                | SpriteKind::GrassBlueLong
                 | SpriteKind::CavernLillypadBlue
-                | SpriteKind::CavernMycelBlue
+                | SpriteKind::MycelBlue
+                | SpriteKind::Mold
                 | SpriteKind::CeilingMushroom => 6,
                 SpriteKind::CaveMushroom
+                | SpriteKind::GlowMushroom
                 | SpriteKind::CookingPot
                 | SpriteKind::CrystalHigh
+                | SpriteKind::LanternFlower
+                | SpriteKind::CeilingLanternFlower
+                | SpriteKind::LanternPlant
+                | SpriteKind::CeilingLanternPlant
                 | SpriteKind::CrystalLow => 10,
                 SpriteKind::SewerMushroom => 16,
                 SpriteKind::Amethyst
diff --git a/common/src/terrain/sprite.rs b/common/src/terrain/sprite.rs
index a5773b7da8..9eafd13111 100644
--- a/common/src/terrain/sprite.rs
+++ b/common/src/terrain/sprite.rs
@@ -160,41 +160,46 @@ sprites! {
         LargeCactus     = 0x05,
         TallCactus      = 0x06,
         // Flowers
-        BlueFlower   = 0x10,
-        PinkFlower   = 0x11,
-        PurpleFlower = 0x12,
-        RedFlower    = 0x13,
-        WhiteFlower  = 0x14,
-        YellowFlower = 0x15,
-        Sunflower    = 0x16,
-        Moonbell     = 0x17,
-        Pyrebloom    = 0x18,
+        BlueFlower    = 0x10,
+        PinkFlower    = 0x11,
+        PurpleFlower  = 0x12,
+        RedFlower     = 0x13,
+        WhiteFlower   = 0x14,
+        YellowFlower  = 0x15,
+        Sunflower     = 0x16,
+        Moonbell      = 0x17,
+        Pyrebloom     = 0x18,
+        LushFlower    = 0x19,
+        LanternFlower = 0x1A,
         // Grasses, ferns, and other 'wild' plants/fungi
         // TODO: remove sizes, make part of the `Growth` attribute
-        LongGrass             = 0x20,
-        MediumGrass           = 0x21,
-        ShortGrass            = 0x22,
-        Fern                  = 0x23,
-        LargeGrass            = 0x24,
-        GrassSnow             = 0x25,
-        Reed                  = 0x26,
-        GrassBlue             = 0x27,
-        SavannaGrass          = 0x28,
-        TallSavannaGrass      = 0x29,
-        RedSavannaGrass       = 0x2A,
-        SavannaBush           = 0x2B,
-        Welwitch              = 0x2C,
-        LeafyPlant            = 0x2D,
-        DeadBush              = 0x2E,
-        JungleFern            = 0x2F,
-        CavernGrassBlueShort  = 0x30,
-        CavernGrassBlueMedium = 0x31,
-        CavernGrassBlueLong   = 0x32,
-        CavernLillypadBlue    = 0x33,
-        EnsnaringVines        = 0x34,
-        LillyPads             = 0x35,
-        JungleLeafyPlant      = 0x36,
-        JungleRedGrass        = 0x37,
+        LongGrass          = 0x20,
+        MediumGrass        = 0x21,
+        ShortGrass         = 0x22,
+        Fern               = 0x23,
+        LargeGrass         = 0x24,
+        GrassSnow          = 0x25,
+        Reed               = 0x26,
+        GrassBlue          = 0x27,
+        SavannaGrass       = 0x28,
+        TallSavannaGrass   = 0x29,
+        RedSavannaGrass    = 0x2A,
+        SavannaBush        = 0x2B,
+        Welwitch           = 0x2C,
+        LeafyPlant         = 0x2D,
+        DeadBush           = 0x2E,
+        JungleFern         = 0x2F,
+        GrassBlueShort     = 0x30,
+        GrassBlueMedium    = 0x31,
+        GrassBlueLong      = 0x32,
+        CavernLillypadBlue = 0x33,
+        EnsnaringVines     = 0x34,
+        LillyPads          = 0x35,
+        JungleLeafyPlant   = 0x36,
+        JungleRedGrass     = 0x37,
+        LanternPlant       = 0x38,
+        SporeReed          = 0x39,
+        DeadPlant          = 0x3A,
         // Crops, berries, and fungi
         Corn          = 0x40,
         WheatYellow   = 0x41,
@@ -213,6 +218,9 @@ sprites! {
         Cotton        = 0x4E,
         WildFlax      = 0x4F,
         SewerMushroom = 0x50,
+        LushMushroom  = 0x51,
+        RockyMushroom = 0x52,
+        GlowMushroom  = 0x53,
         // Seaweeds, corals, and other underwater plants
         StonyCoral       = 0x60,
         SoftCoral        = 0x61,
@@ -227,9 +235,14 @@ sprites! {
         Seagrass         = 0x6A,
         RedAlgae         = 0x6B,
         // Danglying ceiling plants/fungi
-        Liana           = 0x70,
-        CavernMycelBlue = 0x71,
-        CeilingMushroom = 0x72,
+        Liana                   = 0x70,
+        MycelBlue               = 0x71,
+        CeilingMushroom         = 0x72,
+        Mold                    = 0x73,
+        Root                    = 0x74,
+        CeilingLanternPlant     = 0x75,
+        CeilingLanternFlower    = 0x76,
+        CeilingJungleLeafyPlant = 0x77,
     },
     // Solid resources
     // TODO: Remove small variants, make deposit size be an attribute
diff --git a/world/src/layer/cave.rs b/world/src/layer/cave.rs
index 4b87d671f7..fcb78aedf4 100644
--- a/world/src/layer/cave.rs
+++ b/world/src/layer/cave.rs
@@ -778,8 +778,13 @@ fn write_column<R: Rng>(
                         {
                             if head_dist < 0.85 {
                                 let radial = (rpos.x.atan2(rpos.y) * 10.0).sin() * 0.5 + 0.5;
+                                let block_kind = if head_dist < 0.5 {
+                                    BlockKind::GlowingMushroom
+                                } else {
+                                    BlockKind::Rock
+                                };
                                 return Some(Block::new(
-                                    BlockKind::GlowingMushroom,
+                                    block_kind,
                                     Rgb::new(
                                         30,
                                         50 + (radial * 100.0) as u8,
@@ -806,7 +811,7 @@ fn write_column<R: Rng>(
                             let sprites = if dynamic_rng.gen_bool(0.1) {
                                 &[Beehive, Lantern] as &[_]
                             } else {
-                                &[Orb, CavernMycelBlue, CavernMycelBlue] as &[_]
+                                &[/* Orb, */ MycelBlue, MycelBlue] as &[_]
                             };
                             return Some(Block::air(*sprites.choose(dynamic_rng).unwrap()));
                         }
@@ -932,7 +937,8 @@ fn write_column<R: Rng>(
         let mut rng = RandomPerm::new(((vine_pos.x << 16) | vine_pos.y) as u32);
 
         if rng.gen_bool(
-            0.15 * close(biome.mushroom, 1.0, 0.2) as f64
+            0.025
+                * close(biome.mushroom, 1.0, 0.2) as f64
                 * close(max_height as f32, 64.0, 56.0) as f64,
         ) && ceiling_cover > 0.0
         {
@@ -1011,7 +1017,8 @@ fn write_column<R: Rng>(
                 );
                 Block::new(
                     if rand.chance(wpos, (biome.mushroom * biome.mineral * 0.5).max(biome.icy)) {
-                        BlockKind::GlowingWeakRock
+                        // BlockKind::GlowingWeakRock
+                        BlockKind::WeakRock
                     } else if rand.chance(wpos, biome.sandy) {
                         BlockKind::Sand
                     } else {
@@ -1096,20 +1103,26 @@ fn write_column<R: Rng>(
                 }
             } else if let Some(sprite) = (z == floor && !void_below && !sky_above)
                 .then(|| {
-                    if rand.chance(wpos2d.with_z(1), biome.mushroom * 0.05) {
+                    if rand.chance(
+                        wpos2d.with_z(1),
+                        biome.mushroom
+                            * 0.3
+                            * col.marble_mid
+                            * (col.marble_mid > 0.55) as u32 as f32,
+                    ) {
                         [
-                            (SpriteKind::CaveMushroom, 0.15),
+                            (SpriteKind::GlowMushroom, 0.5),
                             (SpriteKind::Mushroom, 0.25),
-                            (SpriteKind::GrassBlue, 1.0),
-                            (SpriteKind::CavernGrassBlueShort, 1.0),
-                            (SpriteKind::CavernGrassBlueMedium, 1.0),
-                            (SpriteKind::CavernGrassBlueLong, 1.0),
+                            (SpriteKind::GrassBlue, 0.0),
+                            (SpriteKind::GrassBlueMedium, 1.5),
+                            (SpriteKind::GrassBlueLong, 2.0),
                             (SpriteKind::Moonbell, 0.01),
+                            (SpriteKind::SporeReed, 2.5),
                         ]
                         .choose_weighted(rng, |(_, w)| *w)
                         .ok()
                         .map(|s| s.0)
-                    } else if rand.chance(wpos2d.with_z(15), biome.leafy * 0.05) {
+                    } else if rand.chance(wpos2d.with_z(15), biome.leafy * 0.05 * col.marble_mid) {
                         [
                             (SpriteKind::LongGrass, 1.0),
                             (SpriteKind::MediumGrass, 2.0),
@@ -1123,6 +1136,10 @@ fn write_column<R: Rng>(
                             (SpriteKind::LeafyPlant, 0.8),
                             (SpriteKind::Twigs, 0.07),
                             (SpriteKind::Wood, 0.03),
+                            (SpriteKind::LanternPlant, 1.0),
+                            (SpriteKind::LanternFlower, 0.6),
+                            (SpriteKind::LushFlower, 0.75),
+                            (SpriteKind::LushMushroom, 0.5),
                         ]
                         .choose_weighted(rng, |(_, w)| *w)
                         .ok()
@@ -1132,6 +1149,7 @@ fn write_column<R: Rng>(
                             (SpriteKind::Bones, 0.5),
                             (SpriteKind::Stones, 1.5),
                             (SpriteKind::DeadBush, 1.0),
+                            (SpriteKind::DeadPlant, 1.5),
                             (SpriteKind::EnsnaringWeb, 0.5),
                             (SpriteKind::Mud, 0.025),
                         ]
@@ -1140,8 +1158,11 @@ fn write_column<R: Rng>(
                         .map(|s| s.0)
                     } else if rand.chance(wpos2d.with_z(14), biome.barren * 0.003) {
                         [
+                            (SpriteKind::Bones, 0.5),
                             (SpriteKind::Welwitch, 0.5),
                             (SpriteKind::DeadBush, 1.5),
+                            (SpriteKind::DeadPlant, 1.5),
+                            (SpriteKind::RockyMushroom, 1.5),
                             (SpriteKind::Crate, 0.005),
                         ]
                         .choose_weighted(rng, |(_, w)| *w)
@@ -1224,24 +1245,32 @@ fn write_column<R: Rng>(
             } else if let Some(sprite) = (z == ceiling - 1 && !void_above)
                 .then(|| {
                     if rand.chance(wpos2d.with_z(3), biome.mushroom * 0.01) {
-                        Some(
-                            *[
-                                SpriteKind::CavernMycelBlue,
-                                SpriteKind::CeilingMushroom,
-                                SpriteKind::Orb,
-                            ]
-                            .choose(rng)
-                            .unwrap(),
-                        )
+                        [
+                            (SpriteKind::MycelBlue, 0.0),
+                            (SpriteKind::CeilingMushroom, 0.0),
+                            // (SpriteKind::Orb, 0.25),
+                            (SpriteKind::Mold, 0.9),
+                        ]
+                        .choose_weighted(rng, |(_, w)| *w)
+                        .ok()
+                        .map(|s| s.0)
                     } else if rand.chance(wpos2d.with_z(4), biome.leafy * 0.015) {
                         [
                             (SpriteKind::Liana, 1.0),
-                            (SpriteKind::Orb, 0.5),
+                            (SpriteKind::CeilingLanternPlant, 1.5),
+                            (SpriteKind::CeilingLanternFlower, 1.25),
+                            (SpriteKind::CeilingJungleLeafyPlant, 1.0),
+                            // (SpriteKind::Orb, 0.0),
                             (SpriteKind::CrystalHigh, 0.1),
                         ]
                         .choose_weighted(rng, |(_, w)| *w)
                         .ok()
                         .map(|s| s.0)
+                    } else if rand.chance(wpos2d.with_z(5), biome.barren * 0.015) {
+                        [(SpriteKind::Root, 1.5)]
+                            .choose_weighted(rng, |(_, w)| *w)
+                            .ok()
+                            .map(|s| s.0)
                     } else if rand.chance(wpos2d.with_z(5), biome.mineral * 0.005) {
                         Some(*[SpriteKind::CrystalHigh].choose(rng).unwrap())
                     } else {
diff --git a/world/src/layer/mod.rs b/world/src/layer/mod.rs
index 01c085823a..b19b5db492 100644
--- a/world/src/layer/mod.rs
+++ b/world/src/layer/mod.rs
@@ -933,7 +933,7 @@ pub fn apply_caverns_to<R: Rng>(canvas: &mut Canvas, dynamic_rng: &mut R) {
                     let sprites = if dynamic_rng.gen_bool(0.1) {
                         &[Beehive, Lantern] as &[_]
                     } else {
-                        &[Orb, CavernMycelBlue, CavernMycelBlue] as &[_]
+                        &[Orb, MycelBlue, MycelBlue] as &[_]
                     };
                     return Some(Block::air(*sprites.choose(dynamic_rng).unwrap()));
                 }
@@ -1091,11 +1091,7 @@ pub fn apply_caverns_to<R: Rng>(canvas: &mut Canvas, dynamic_rng: &mut R) {
                 Block::air(
                     *if dynamic_rng.gen_bool(0.9) {
                         // High density
-                        &[
-                            CavernGrassBlueShort,
-                            CavernGrassBlueMedium,
-                            CavernGrassBlueLong,
-                        ] as &[_]
+                        &[GrassBlueShort, GrassBlueMedium, GrassBlueLong] as &[_]
                     } else if dynamic_rng.gen_bool(0.5) {
                         // Medium density
                         &[CaveMushroom] as &[_]
@@ -1108,7 +1104,7 @@ pub fn apply_caverns_to<R: Rng>(canvas: &mut Canvas, dynamic_rng: &mut R) {
                 )
             } else if z == cavern_top - 1 && dynamic_rng.gen_bool(0.001) {
                 Block::air(
-                    *[CrystalHigh, CeilingMushroom, Orb, CavernMycelBlue]
+                    *[CrystalHigh, CeilingMushroom, Orb, MycelBlue]
                         .choose(dynamic_rng)
                         .unwrap(),
                 )