diff --git a/src/main/resources/assets/biomesoplenty/models/block/flowering_oak_leaves.json b/src/main/resources/assets/biomesoplenty/models/block/flowering_oak_leaves.json
index 4a91fb76c..b181a2447 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/flowering_oak_leaves.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/flowering_oak_leaves.json
@@ -1,7 +1,7 @@
 {
     "parent": "biomesoplenty:block/leaves_overlay",
     "textures": {
-        "under": "biomesoplenty:blocks/flowering_oak_leaves",
-        "over": "biomesoplenty:blocks/flowering_oak_leaves_overlay"
+        "leaves": "biomesoplenty:blocks/flowering_oak_leaves",
+        "overlay": "biomesoplenty:blocks/flowering_oak_leaves_overlay"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/flowering_oak_leaves_fast.json b/src/main/resources/assets/biomesoplenty/models/block/flowering_oak_leaves_fast.json
deleted file mode 100644
index 160e138fa..000000000
--- a/src/main/resources/assets/biomesoplenty/models/block/flowering_oak_leaves_fast.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "block/leaves",
-    "textures": {
-        "all": "biomesoplenty:blocks/flowering_oak_leaves_fast"
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/biomesoplenty/models/block/leaves_overlay.json b/src/main/resources/assets/biomesoplenty/models/block/leaves_overlay.json
index 1512542f8..180e6f975 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/leaves_overlay.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/leaves_overlay.json
@@ -1,29 +1,29 @@
 {
     "parent": "block/block",
     "textures": {
-        "particle": "#under"
+        "particle": "#leaves"
     },
     "elements": [
         {   "from": [ 0, 0, 0 ],
             "to": [ 16, 16, 16 ],
             "faces": {
-                "down":  { "uv": [ 0, 0, 16, 16 ], "texture": "#under", "tintindex": 1 },
-                "up":    { "uv": [ 0, 0, 16, 16 ], "texture": "#under", "tintindex": 1 },
-                "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#under", "tintindex": 1 },
-                "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#under", "tintindex": 1 },
-                "west":  { "uv": [ 0, 0, 16, 16 ], "texture": "#under", "tintindex": 1 },
-                "east":  { "uv": [ 0, 0, 16, 16 ], "texture": "#under", "tintindex": 1 }
+                "down":  { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay"},
+                "up":    { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay"},
+                "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay"},
+                "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay"},
+                "west":  { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay"},
+                "east":  { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay"}
             }
         },
         {   "from": [ 0, 0, 0 ],
             "to": [ 16, 16, 16 ],
             "faces": {
-                "down":  { "uv": [ 0, 0, 16, 16 ], "texture": "#over", "cullface": "down"},
-                "up":    { "uv": [ 0, 0, 16, 16 ], "texture": "#over", "cullface": "up"},
-                "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#over", "cullface": "north"},
-                "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#over", "cullface": "south"},
-                "west":  { "uv": [ 0, 0, 16, 16 ], "texture": "#over", "cullface": "west"},
-                "east":  { "uv": [ 0, 0, 16, 16 ], "texture": "#over", "cullface": "east"}
+                "down":  { "uv": [ 0, 0, 16, 16 ], "texture": "#leaves", "tintindex": 1 },
+                "up":    { "uv": [ 0, 0, 16, 16 ], "texture": "#leaves", "tintindex": 1 },
+                "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#leaves", "tintindex": 1 },
+                "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#leaves", "tintindex": 1 },
+                "west":  { "uv": [ 0, 0, 16, 16 ], "texture": "#leaves", "tintindex": 1 },
+                "east":  { "uv": [ 0, 0, 16, 16 ], "texture": "#leaves", "tintindex": 1 }
             }
         }
     ]
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/flowering_oak_leaves.png b/src/main/resources/assets/biomesoplenty/textures/blocks/flowering_oak_leaves.png
index 7bff4ce9b..de02b3651 100644
Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/flowering_oak_leaves.png and b/src/main/resources/assets/biomesoplenty/textures/blocks/flowering_oak_leaves.png differ
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/flowering_oak_leaves_fast.png b/src/main/resources/assets/biomesoplenty/textures/blocks/flowering_oak_leaves_fast.png
deleted file mode 100644
index d4ad8851f..000000000
Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/flowering_oak_leaves_fast.png and /dev/null differ