diff --git a/assets/cubyz/blocks/non_degradable_oak_leaves.json b/assets/cubyz/blocks/non_degradable_oak_leaves.json
index 70f86ac0..e75eec95 100644
--- a/assets/cubyz/blocks/non_degradable_oak_leaves.json
+++ b/assets/cubyz/blocks/non_degradable_oak_leaves.json
@@ -6,8 +6,8 @@
 		"0.1 cubyz:apple"
 	],
 	"degradable" : false,
-	"viewThrough" : true,
+	"alwaysViewThrough" : true,
 	"absorbedLight" : 0x121012,
 	"model" : "cube",
-	"texture" : "cubyz:oak_leaves_transparent"
+	"texture" : "cubyz:oak_leaves"
 }
diff --git a/assets/cubyz/blocks/oak_leaves.json b/assets/cubyz/blocks/oak_leaves.json
index 6c1c0343..169bcd25 100644
--- a/assets/cubyz/blocks/oak_leaves.json
+++ b/assets/cubyz/blocks/oak_leaves.json
@@ -9,5 +9,5 @@
 	"alwaysViewThrough" : true,
 	"absorbedLight" : 0x121012,
 	"model" : "cube",
-	"texture" : "cubyz:oak_leaves_transparent"
+	"texture" : "cubyz:oak_leaves"
 }
diff --git a/assets/cubyz/blocks/oak_log.json b/assets/cubyz/blocks/oak_log.json
index 79d16d15..989cc547 100644
--- a/assets/cubyz/blocks/oak_log.json
+++ b/assets/cubyz/blocks/oak_log.json
@@ -6,7 +6,7 @@
 	],
 	"rotation" : "log",
 	"model" : "cube",
-	"texture" : "cubyz:oak_log_side",
-	"texture_top" : "cubyz:oak_log_rings_top",
-	"texture_bottom" : "cubyz:oak_log_rings_top"
+	"texture" : "cubyz:oak_log",
+	"texture_top" : "cubyz:oak_log_top",
+	"texture_bottom" : "cubyz:oak_log_top"
 }
diff --git a/assets/cubyz/blocks/oak_top.json b/assets/cubyz/blocks/oak_top.json
index b97ca1ad..f726868f 100644
--- a/assets/cubyz/blocks/oak_top.json
+++ b/assets/cubyz/blocks/oak_top.json
@@ -6,7 +6,7 @@
 	],
 	"rotation" : "log",
 	"model" : "cube",
-	"texture" : "cubyz:oak_log_side",
-	"texture_top" : "cubyz:oak_log_side",
-	"texture_bottom" : "cubyz:oak_log_rings_top",
+	"texture" : "cubyz:oak_log",
+	"texture_top" : "cubyz:oak_log",
+	"texture_bottom" : "cubyz:oak_log_top",
 }
diff --git a/assets/cubyz/blocks/textures/oak_leaves.png b/assets/cubyz/blocks/textures/oak_leaves.png
index a3b5d6bc..39d4d39f 100644
Binary files a/assets/cubyz/blocks/textures/oak_leaves.png and b/assets/cubyz/blocks/textures/oak_leaves.png differ
diff --git a/assets/cubyz/blocks/textures/oak_leaves_opaque.png b/assets/cubyz/blocks/textures/oak_leaves_opaque.png
new file mode 100644
index 00000000..c78f00e4
Binary files /dev/null and b/assets/cubyz/blocks/textures/oak_leaves_opaque.png differ
diff --git a/assets/cubyz/blocks/textures/oak_leaves_transparent.png b/assets/cubyz/blocks/textures/oak_leaves_transparent.png
deleted file mode 100644
index 39d4d39f..00000000
Binary files a/assets/cubyz/blocks/textures/oak_leaves_transparent.png and /dev/null differ
diff --git a/assets/cubyz/blocks/textures/oak_log_side.png b/assets/cubyz/blocks/textures/oak_log.png
similarity index 100%
rename from assets/cubyz/blocks/textures/oak_log_side.png
rename to assets/cubyz/blocks/textures/oak_log.png
diff --git a/assets/cubyz/blocks/textures/oak_log_rings_top.png b/assets/cubyz/blocks/textures/oak_log_rings_top.png
deleted file mode 100644
index bc385a7b..00000000
Binary files a/assets/cubyz/blocks/textures/oak_log_rings_top.png and /dev/null differ
diff --git a/assets/cubyz/blocks/textures/oak_log_top.png b/assets/cubyz/blocks/textures/oak_log_top.png
index 117b2139..bc385a7b 100644
Binary files a/assets/cubyz/blocks/textures/oak_log_top.png and b/assets/cubyz/blocks/textures/oak_log_top.png differ
diff --git a/assets/cubyz/blocks/textures/pine_needles.png b/assets/cubyz/blocks/textures/pine_needles.png
index 35b3bbd2..27292ed3 100644
Binary files a/assets/cubyz/blocks/textures/pine_needles.png and b/assets/cubyz/blocks/textures/pine_needles.png differ
diff --git a/assets/cubyz/blocks/textures/pine_needles_opaque.png b/assets/cubyz/blocks/textures/pine_needles_opaque.png
new file mode 100644
index 00000000..520c3c35
Binary files /dev/null and b/assets/cubyz/blocks/textures/pine_needles_opaque.png differ