diff --git a/init.lua b/init.lua
index 6de50724dd41a3252f5bab8e65a7faf1fea5b470..5b748ed6c2b304c7b24d3a5b7d6617d2a8c226c9 100644
--- a/init.lua
+++ b/init.lua
@@ -11,7 +11,7 @@
 ethereal = {} -- DO NOT change settings below, use the settings.conf file
 ethereal.version = "1.22"
 ethereal.leaftype = 0 -- 0 for 2D plantlike, 1 for 3D allfaces
-ethereal.leafwalk = true -- true for walkable leaves, false to fall through
+ethereal.leafwalk = false -- true for walkable leaves, false to fall through
 ethereal.cavedirt = true -- caves chop through dirt when true
 ethereal.torchdrop = true -- torches drop when touching water
 ethereal.papyruswalk = true -- papyrus can be walked on
diff --git a/leaves.lua b/leaves.lua
index 584a7738b68516c7057bd89a6b8cf24b807f17a5..6c74ba8825ea5c9e9396edf8a4b512c4278218e8 100644
--- a/leaves.lua
+++ b/leaves.lua
@@ -15,6 +15,7 @@ minetest.override_item("default:leaves", {
 	inventory_image = "default_leaves.png",
 	wield_image = "default_leaves.png",
 	walkable = ethereal.leafwalk,
+	climbable = true,
     drop = {
         max_items = 1,
         items = {
@@ -32,6 +33,7 @@ minetest.override_item("default:jungleleaves", {
 	inventory_image = "default_jungleleaves.png",
 	wield_image = "default_jungleleaves.png",
 	walkable = ethereal.leafwalk,
+	climbable = true,
     drop = {
         max_items = 1,
         items = {
@@ -49,6 +51,7 @@ minetest.override_item("default:pine_needles", {
 	inventory_image = "default_pine_needles.png",
 	wield_image = "default_pine_needles.png",
 	walkable = ethereal.leafwalk,
+	climbable = true,
 	drop = {
 		max_items = 1,
 		items = {
@@ -67,6 +70,7 @@ minetest.override_item("default:acacia_leaves", {
 	wield_image = "default_acacia_leaves.png",
 	visual_scale = 1.4,
 	walkable = ethereal.leafwalk,
+	climbable = true,
     drop = {
         max_items = 1,
         items = {
@@ -85,6 +89,7 @@ minetest.override_item("default:aspen_leaves", {
 	wield_image = "default_aspen_leaves.png",
 	visual_scale = 1.4,
 	walkable = ethereal.leafwalk,
+	climbable = true,
     drop = {
         max_items = 1,
         items = {
@@ -104,6 +109,7 @@ minetest.register_node("ethereal:willow_twig", {
 	wield_image = "willow_twig.png",
 	paramtype = "light",
 	walkable = ethereal.leafwalk,
+	climbable = true,
 	visual_scale = 1.4,
 	waving = 1,
 	groups = {snappy = 3, leafdecay = 3, leaves = 1, flammable = 2},
@@ -129,6 +135,7 @@ minetest.register_node("ethereal:redwood_leaves", {
 	wield_image = "redwood_leaves.png",
 	paramtype = "light",
 	walkable = ethereal.leafwalk,
+	climbable = true,
 	waving = 1,
 	groups = {snappy = 3, leafdecay = 3, leaves = 1, flammable = 2},
 	drop = {
@@ -153,6 +160,7 @@ minetest.register_node("ethereal:orange_leaves", {
 	wield_image = "orange_leaves.png",
 	paramtype = "light",
 	walkable = ethereal.leafwalk,
+	climbable = true,
 	waving = 1,
 	groups = {snappy = 3, leafdecay = 3, leaves = 1, flammable = 2},
 	drop = {
@@ -177,6 +185,7 @@ minetest.register_node("ethereal:bananaleaves", {
 	wield_image = "banana_leaf.png",
 	paramtype = "light",
 	walkable = ethereal.leafwalk,
+	climbable = true,
 	waving = 1,
 	groups = {snappy = 3, leafdecay = 3, leaves = 1, flammable = 2},
 	drop = {
@@ -201,6 +210,7 @@ minetest.register_node("ethereal:yellowleaves", {
 	wield_image = "yellow_leaves.png",
 	paramtype = "light",
 	walkable = ethereal.leafwalk,
+	climbable = true,
 	waving = 1,
 	groups = {snappy = 3, leafdecay = 3, leaves = 1},
 	drop = {
@@ -228,6 +238,7 @@ minetest.register_node("ethereal:palmleaves", {
 	wield_image = "moretrees_palm_leaves.png",
 	paramtype = "light",
 	walkable = ethereal.leafwalk,
+	climbable = true,
 	waving = 1,
 	groups = {snappy = 3, leafdecay = 3, leaves = 1, flammable = 2},
 	drop = {
@@ -252,6 +263,7 @@ minetest.register_node("ethereal:birch_leaves", {
 	wield_image = "moretrees_birch_leaves.png",
 	paramtype = "light",
 	walkable = ethereal.leafwalk,
+	climbable = true,
 	waving = 1,
 	groups = {snappy = 3, leafdecay = 3, leaves = 1, flammable = 2},
 	drop = {
@@ -276,6 +288,7 @@ minetest.register_node("ethereal:frost_leaves", {
 	wield_image = "ethereal_frost_leaves.png",
 	paramtype = "light",
 	walkable = ethereal.leafwalk,
+	climbable = true,
 	waving = 1,
 	groups = {snappy = 3, leafdecay = 3, leaves = 1, puts_out_fire = 1},
 	drop = {
@@ -301,6 +314,7 @@ minetest.register_node("ethereal:bamboo_leaves", {
 	wield_image = "bamboo_leaves.png",
 	paramtype = "light",
 	walkable = ethereal.leafwalk,
+	climbable = true,
 	waving = 1,
 	groups = {snappy = 3, leafdecay = 3, leaves = 1, flammable = 2},
 	drop = {